Merge commit 'v3.4-rc7' into android-tegra-nv-3.4-main
Varun Wadekar [Thu, 24 May 2012 12:02:10 +0000 (17:02 +0530)]
Conflicts:
Documentation/cgroups/cgroups.txt
Documentation/driver-model/devres.txt
Documentation/feature-removal-schedule.txt
arch/arm/configs/tegra_defconfig
arch/arm/include/asm/hardware/cache-l2x0.h
arch/arm/kernel/ftrace.c
arch/arm/kernel/kprobes.c
arch/arm/kernel/process.c
arch/arm/kernel/smp.c
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/apbio.c
arch/arm/mach-tegra/apbio.h
arch/arm/mach-tegra/board-harmony-pinmux.c
arch/arm/mach-tegra/board-harmony-power.c
arch/arm/mach-tegra/clock.c
arch/arm/mach-tegra/clock.h
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/cpuidle.c
arch/arm/mach-tegra/devices.c
arch/arm/mach-tegra/devices.h
arch/arm/mach-tegra/dma.c
arch/arm/mach-tegra/flowctrl.c
arch/arm/mach-tegra/fuse.c
arch/arm/mach-tegra/fuse.h
arch/arm/mach-tegra/headsmp.S
arch/arm/mach-tegra/include/mach/clk.h
arch/arm/mach-tegra/include/mach/debug-macro.S
arch/arm/mach-tegra/include/mach/gpio-tegra.h
arch/arm/mach-tegra/include/mach/io.h
arch/arm/mach-tegra/include/mach/irqs.h
arch/arm/mach-tegra/include/mach/kbc.h
arch/arm/mach-tegra/include/mach/powergate.h
arch/arm/mach-tegra/include/mach/uncompress.h
arch/arm/mach-tegra/include/mach/usb_phy.h
arch/arm/mach-tegra/irq.c
arch/arm/mach-tegra/pcie.c
arch/arm/mach-tegra/platsmp.c
arch/arm/mach-tegra/powergate.c
arch/arm/mach-tegra/reset.c
arch/arm/mach-tegra/reset.h
arch/arm/mach-tegra/sleep.S
arch/arm/mach-tegra/tegra2_clocks.c
arch/arm/mach-tegra/tegra2_emc.c
arch/arm/mach-tegra/tegra30_clocks.c
arch/arm/mach-tegra/timer.c
arch/arm/mach-tegra/usb_phy.c
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
arch/x86/kernel/process.c
drivers/acpi/processor_idle.c
drivers/base/regmap/regcache-rbtree.c
drivers/base/regmap/regcache.c
drivers/base/regmap/regmap-i2c.c
drivers/base/regmap/regmap-spi.c
drivers/base/regmap/regmap.c
drivers/cpuidle/cpuidle.c
drivers/cpuidle/governors/menu.c
drivers/crypto/Kconfig
drivers/crypto/Makefile
drivers/crypto/tegra-aes.c
drivers/crypto/tegra-aes.h
drivers/gpio/gpio-tegra.c
drivers/hwmon/Kconfig
drivers/i2c/busses/i2c-tegra.c
drivers/input/Makefile
drivers/input/evdev.c
drivers/input/keyboard/gpio_keys.c
drivers/iommu/tegra-smmu.c
drivers/md/dm-crypt.c
drivers/media/video/Kconfig
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/mfd/tps65090.c
drivers/mmc/core/core.c
drivers/mmc/core/mmc.c
drivers/mmc/host/sdhci-tegra.c
drivers/mmc/host/sdhci.c
drivers/mmc/host/sdhci.h
drivers/mtd/chips/cfi_cmdset_0002.c
drivers/net/usb/Kconfig
drivers/net/usb/Makefile
drivers/net/wireless/ath/ath6kl/cfg80211.c
drivers/power/Makefile
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/regulator/tps62360-regulator.c
drivers/regulator/tps65912-regulator.c
drivers/rtc/Kconfig
drivers/staging/android/Kconfig
drivers/staging/android/Makefile
drivers/staging/android/TODO
drivers/staging/android/alarm-dev.c
drivers/staging/android/android_alarm.h
drivers/staging/android/ashmem.c
drivers/staging/android/logger.c
drivers/staging/android/lowmemorykiller.c
drivers/staging/android/persistent_ram.c
drivers/staging/android/ram_console.c
drivers/staging/iio/magnetometer/ak8975.c
drivers/tty/serial/8250/8250.c
drivers/usb/gadget/fsl_udc_core.c
drivers/usb/host/Kconfig
drivers/usb/host/ehci-fsl.c
drivers/usb/host/ehci-hub.c
drivers/usb/host/ehci-tegra.c
drivers/video/Kconfig
fs/namei.c
fs/proc/stat.c
include/linux/cgroup.h
include/linux/cpuidle.h
include/linux/input.h
include/linux/kernel.h
include/linux/mfd/tps65090.h
include/linux/mmc/card.h
include/linux/mmc/host.h
include/linux/mmc/mmc.h
include/linux/platform_data/tegra_emc.h
include/linux/pm_qos.h
include/linux/power_supply.h
include/linux/regmap.h
include/linux/regulator/consumer.h
kernel/cgroup.c
kernel/power/main.c
kernel/sched/core.c
net/bluetooth/hci_core.c
net/bluetooth/mgmt.c
net/ipv4/netfilter/Kconfig
net/sunrpc/netns.h
net/sunrpc/sunrpc_syms.c
net/wireless/nl80211.c
security/Kconfig
security/Makefile
security/commoncap.c
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_conexant.c
sound/soc/codecs/wm8753.c
sound/soc/tegra/tegra_i2s.c
sound/soc/tegra/tegra_spdif.c

Change-Id: I7e0111ce16885bab096d37bedcf4f15f504264a8
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>

1  2 
fs/namei.c

diff --cc fs/namei.c
@@@ -1407,18 -1407,9 +1407,20 @@@ static inline int can_lookup(struct ino
   */
  #ifdef CONFIG_DCACHE_WORD_ACCESS
  
 +#ifdef CONFIG_64BIT
 +
+ #include <asm/word-at-a-time.h>
 -#ifdef CONFIG_64BIT
 +/*
 + * Jan Achrenius on G+: microoptimized version of
 + * the simpler "(mask & ONEBYTES) * ONEBYTES >> 56"
 + * that works for the bytemasks without having to
 + * mask them first.
 + */
 +static inline long count_masked_bytes(unsigned long mask)
 +{
 +      return mask*0x0001020304050608ul >> 56;
 +}
  
  static inline unsigned int fold_hash(unsigned long hash)
  {