Paul Mundt
bba958783b
mmc: sh_mmcif: Convert to __raw_xxx() I/O accessors. ...
When using the I/O accessors in raw mode from the boot stubs we don't
want to bother with any of the complexity associated with readl/writel
and friends. Furthermore, utilization within the context of the host
driver itself is all performed on an ioremapped window, so using the
__raw variants there doesn't pose any problem either.
If and when barriers need to be added in the future, these will need to
be explicitly written out, but this is so far not a concern for any of
the affected CPUs in question.
This fixes up the link error introduced by the ARM tree via its barrier
refactoring:
arch/arm/boot/compressed/mmcif-sh7372.o: In function `mmcif_loader':
mmcif-sh7372.c:(.text+0x9e8): undefined reference to `outer_cache
Following the change in:
http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=6275/1
Reported-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2011-01-14 15:57:47 +09:00
Merge branch 'misc' into devel
2011-01-06 22:32:52 +00:00
net/ceph: make ceph_msgr_wq non-reentrant
2011-01-12 15:15:14 -08:00
decompressors: remove unused constant from inflate.h
2011-01-13 08:03:25 -08:00
hwmon: Support for Dallas Semiconductor DS620
2011-01-09 09:10:10 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-01-13 09:58:14 -08:00
lockd: Clean up nlmsvc_lookup_host()
2010-12-16 12:37:26 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
2011-01-13 10:32:54 -08:00
mmc: sh_mmcif: Convert to __raw_xxx() I/O accessors.
2011-01-14 15:57:47 +09:00
netfilter: x_tables: dont block BH while reading counters
2011-01-10 20:11:38 +01:00
NFC: Driver for NXP Semiconductors PN544 NFC chip.
2011-01-13 08:03:19 -08:00
regulator: Add initial per-regulator debugfs support
2011-01-12 14:33:05 +00:00
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
2011-01-07 17:08:46 -08:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-12-26 22:37:05 -08:00
Merge branch 'nfs-for-2.6.38' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
2011-01-11 15:11:56 -08:00
include/linux/unaligned/packed_struct.h: use __packed
2011-01-13 08:03:08 -08:00
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2011-01-07 13:16:28 -08:00
acpi: fix _OSI string setup regression
2010-12-11 01:28:58 -05:00
agp: kill agp_rebind_memory
2010-11-23 20:14:46 +00:00
atm: correct sysfs 'device' link creation and parent relationships
2010-12-10 15:45:05 -08:00
headers: path.h redux
2011-01-10 08:51:44 -08:00
lib: Improve EWMA efficiency by using bitshifts
2010-12-06 15:58:43 -05:00
netdev: bfin_mac: let boards set vlan masks
2011-01-10 13:31:14 -08:00
binfmt_elf: cleanups
2011-01-13 08:03:12 -08:00
bit_spinlock: add required includes
2011-01-07 17:50:31 +11:00
Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
2011-01-13 10:45:01 -08:00
bootmem: Add alloc_bootmem_align()
2010-12-13 16:11:13 -08:00
security: Define CAP_SYSLOG
2010-11-29 08:35:12 +11:00
fs/char_dev.c: remove unused cdev_index()
2011-01-13 08:03:17 -08:00
cdrom: add ->check_events() support
2010-12-16 17:53:38 +01:00
ARM: 6483/1: arm & sh: factorised duplicated clkdev.c
2010-11-26 10:51:04 +00:00
clarify a usage constraint for cnt32_to_63()
2010-12-20 09:07:35 -08:00
thp: use compaction in kswapd for GFP_ATOMIC order > 0
2011-01-13 17:32:46 -08:00
sched: Change wait_for_completion_*_timeout() to return a signed long
2011-01-05 14:15:50 +01:00
tty: add 'active' sysfs attribute to tty0 and console device
2010-12-16 16:15:34 -08:00
cramfs: hide function prototypes behind __KERNEL__ macro
2011-01-13 08:03:22 -08:00
ARM: 6485/5: proc/vmcore - allow archs to override vmcore_elf_check_arch()
2010-11-30 13:39:55 +00:00
drivers/staging/olpc_dcon: convert to new cs5535 gpio API
2011-01-13 08:03:13 -08:00
fs: fix dcache.h kernel-doc notation
2011-01-10 07:38:53 -08:00
dcbnl: adding DCBX feature flags get-set
2010-12-31 10:50:54 -08:00
dccp: Policy-based packet dequeueing infrastructure
2010-12-07 13:47:12 +01:00
headers: path.h redux
2011-01-10 08:51:44 -08:00
dm: per target unplug callback support
2011-01-13 20:00:02 +00:00
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2011-01-10 16:10:33 -08:00
dm: use non reentrant workqueues if equivalent
2011-01-13 19:59:58 +00:00
dm log userspace: add version number to comms
2011-01-13 19:59:52 +00:00
dmaengine: provide dummy functions for DMA_ENGINE=n
2011-01-03 01:41:40 -08:00
dmar, x86: Use function stubs when CONFIG_INTR_REMAP is disabled
2010-11-26 09:57:36 +01:00
dynamic debug: Fix build issue with older gcc
2011-01-07 23:36:59 -05:00
core: Replace __get_cpu_var with __this_cpu_read if not used for an address.
2010-12-17 15:07:19 +01:00
net: Add alloc_netdev_mqs function
2011-01-10 16:05:30 -08:00
ethtool: Report link-down while interface is down
2010-12-10 15:55:23 -08:00
ext3: speed up file creates by optimizing rec_len functions
2011-01-10 19:04:07 +01:00
fs: add hole punching to fallocate
2011-01-12 20:16:43 -05:00
fanotify: split version into version and metadata_len
2010-12-15 13:56:33 -05:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
2010-12-22 12:56:10 +09:00
net/fec: add mac field into platform data and consolidate fec_get_mac
2011-01-09 15:42:55 -08:00
filter: constify sk_run_filter()
2010-12-08 10:30:34 -08:00
firewire: use split transaction timeout only for split transactions
2011-01-04 08:48:34 +01:00
headers: kobject.h redux
2011-01-10 08:51:44 -08:00
flex_array: fix flex_array_put_ptr macro to be valid C
2010-11-30 17:28:57 -05:00
Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
2011-01-13 10:45:01 -08:00
fs: fs_struct use seqlock
2011-01-07 17:50:27 +11:00
fs: dcache remove dcache_lock
2011-01-07 17:50:23 +11:00
fs: dcache remove dcache_lock
2011-01-07 17:50:23 +11:00
tracing/events: Show real number in array fields
2010-11-19 10:18:47 -05:00
fuse: fix ioctl ABI
2010-12-07 20:16:56 +01:00
fs: provide rcu-walk aware permission i_ops
2011-01-07 17:50:29 +11:00
Merge branch 'for-2.6.38/event-handling' into for-2.6.38/core
2011-01-13 14:47:54 +01:00
thp: add numa awareness to hugepage allocations
2011-01-13 17:32:45 -08:00
i2c: Add generic I2C multiplexer using GPIO API
2011-01-10 22:11:23 +01:00
Revert "gpiolib: annotate gpio-intialization with __must_check"
2011-01-13 17:26:46 -08:00
Input: add input driver for polled GPIO buttons
2010-12-06 17:15:15 -08:00
hardirq.h: needs sched.h if using BKL
2010-11-18 10:56:29 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2011-01-13 09:58:38 -08:00
highmem: Use this_cpu_xx_return() operations
2010-12-17 15:18:04 +01:00
hrtimer.h: fix kernel-doc warning
2011-01-10 07:38:53 -08:00
thp: add compound_trans_head() helper
2011-01-13 17:32:48 -08:00
i2c: Delete unused adapter IDs
2010-11-15 22:40:38 +01:00
i2c: Constify i2c_client where possible
2011-01-10 22:11:23 +01:00
mac80211: Remove unused third address from mesh address extension header.
2010-12-20 14:49:47 -05:00
crypto: af_alg - User-space interface for Crypto API
2010-11-19 17:47:57 +08:00
netfilter: ebtables: make broute table work again
2011-01-11 23:55:51 +01:00
include/linux/if_ether.h: Add #define ETH_P_LINK_CTL for HPNA and wlan local tunnel
2011-01-06 11:10:05 -08:00
macvlan: Introduce 'passthru' mode to takeover the underlying device
2010-11-22 08:24:29 -08:00
macvlan: lockless tx path
2010-11-16 10:58:30 -08:00
net: typos in comments in include/linux/igmp.h
2011-01-04 11:29:52 -08:00
__in_dev_get_rtnl() can use rtnl_dereference()
2010-12-06 12:59:05 -08:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2011-01-06 10:23:33 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2011-01-13 09:58:14 -08:00
resources: add arch hook for preventing allocation in reserved areas
2010-12-17 10:01:09 -08:00
ipv6: mcast: RCU conversion
2010-11-24 11:16:42 -08:00
irq: use per_cpu kstat_irqs
2011-01-13 17:32:31 -08:00
ext4: dynamically allocate the jbd2_inode in ext4_inode_info as necessary
2011-01-10 12:29:43 -05:00
The new jhash implementation
2010-12-09 20:17:07 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2011-01-13 10:25:58 -08:00
mm: vmscan: reclaim order-0 and use compaction instead of lumpy reclaim
2011-01-13 17:32:33 -08:00
irq: use per_cpu kstat_irqs
2011-01-13 17:32:31 -08:00
thp: madvise(MADV_NOHUGEPAGE)
2011-01-13 17:32:47 -08:00
kmsg_dump: add kmsg_dump() calls to the reboot, halt, poweroff and emergency_restart paths
2011-01-13 08:03:07 -08:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2011-01-07 17:02:58 -08:00
block: add internal hd part table references
2011-01-07 08:43:37 +01:00
kthread_work: make lockdep happy
2010-12-22 10:27:53 +01:00
KVM: Add PV MSR to enable asynchronous page faults delivery.
2011-01-12 11:23:12 +02:00
KVM: Fix build error on s390 due to missing tlbs_dirty
2011-01-12 11:30:50 +02:00
KVM: Add memory slot versioning and use it to provide fast guest write interface
2011-01-12 11:23:08 +02:00
leds-lp5521: modify the way of setting led device name
2011-01-13 08:03:06 -08:00
leds: leds-lp5523: modify the way of setting led device name
2011-01-13 08:03:05 -08:00
[libata] avoid needlessly passing around ptr to SCSI completion func
2011-01-05 19:43:22 -05:00
kernel: add bl_list
2011-01-07 17:50:31 +11:00
phylib: Add support for Marvell 88E1149R devices.
2010-11-22 08:34:23 -08:00
ext2: Resolve 'dereferencing pointer to incomplete type' when enabling EXT2_XATTR_DEBUG
2011-01-10 19:04:08 +01:00
tg3: Move EEE definitions into mdio.h
2010-12-06 11:03:46 -08:00
memcg: fix memory migration of shmem swapcache
2011-01-13 17:32:51 -08:00
thp: remove PG_buddy
2011-01-13 17:32:43 -08:00
mm: migration: cleanup migrate_pages API by matching types for offlining and sync
2011-01-13 17:32:34 -08:00
thp: madvise(MADV_NOHUGEPAGE)
2011-01-13 17:32:47 -08:00
thp: fix anon memory statistics with transparent hugepages
2011-01-13 17:32:46 -08:00
thp: add pmd_huge_pte to mm_struct
2011-01-13 17:32:41 -08:00
thp: mmu_notifier_test_young
2011-01-13 17:32:46 -08:00
thp: transparent hugepage vmstat
2011-01-13 17:32:43 -08:00
Merge commit 'v2.6.37-rc7' into x86/security
2010-12-23 09:48:41 +01:00
fs: scale mntget/mntput
2011-01-07 17:50:33 +11:00
mutexes, sched: Introduce arch_mutex_cpu_relax()
2010-11-26 15:05:34 +01:00
fs: rcu-walk for path lookup
2011-01-07 17:50:27 +11:00
move internal-only parts of ncpfs headers to fs/ncpfs
2011-01-12 20:03:43 -05:00
move internal-only parts of ncpfs headers to fs/ncpfs
2011-01-12 20:03:43 -05:00
fs: avoid inode RCU freeing for pseudo fs
2011-01-07 17:50:26 +11:00
net: Add alloc_netdev_mqs function
2011-01-10 16:05:30 -08:00
netfilter: allow hooks to pass error code back up the stack
2010-11-17 10:54:34 -08:00
netlink: fix gcc -Wconversion compilation warning
2010-12-17 12:03:14 -08:00
NFS: Introduce new-style XDR decoding functions for NFSv2
2010-12-16 12:37:23 -05:00
NFS fix the setting of exchange id flag
2011-01-11 14:17:09 -05:00
fs: provide rcu-walk aware permission i_ops
2011-01-07 17:50:29 +11:00
NFS: Move cl_delegations to the nfs_server struct
2011-01-06 14:57:46 -05:00
nfs: remove extraneous and problematic calls to nfs_clear_request
2010-12-07 23:02:44 -05:00
NFSv4: Ensure continued open and lockowner name uniqueness
2011-01-06 16:03:13 -05:00
nl80211: Export available antennas
2010-12-20 14:49:47 -05:00
x86, nmi_watchdog: Remove ARCH_HAS_NMI_WATCHDOG and rely on CONFIG_HARDLOCKUP_DETECTOR
2010-12-22 22:15:32 +01:00
of/address: use proper endianess in get_flags
2010-12-23 15:57:48 -07:00
of/flattree: forward declare struct device_node in of_fdt.h
2011-01-08 21:42:42 -07:00
thp: remove PG_buddy
2011-01-13 17:32:43 -08:00
memcg: add lock to synchronize page accounting and migration
2011-01-13 17:32:50 -08:00
mm: remove likely() from mapping_unevictable()
2011-01-13 17:32:36 -08:00
fs: scale mntget/mntput
2011-01-07 17:50:33 +11:00
memstick: add support for JMicron JMB 385 and 390 controllers
2011-01-13 08:03:21 -08:00
percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support
2010-12-18 15:54:04 +01:00
perf: Sysfs enumeration
2010-12-16 11:36:43 +01:00
pipe_fs_i.h: fix kernel-doc warning
2011-01-10 07:38:54 -08:00
PM: Prototype the pm_generic_ operations
2010-12-24 15:04:41 +01:00
PM / Runtime: Generic resume shouldn't set RPM_ACTIVE unconditionally
2010-12-24 15:04:06 +01:00
poll: fix a typo in comment
2010-12-10 15:06:43 +01:00
fs: provide simple rcu-walk generic_check_acl implementation
2011-01-07 17:50:29 +11:00
pps: add kernel consumer support
2011-01-13 08:03:21 -08:00
pps: capture MONOTONIC_RAW timestamps as well
2011-01-13 08:03:21 -08:00
include/linux/printk.h: use tab not spaces for indent
2011-01-13 08:03:10 -08:00
spi/pxa2xx: Add chipselect support for Sodaville
2010-12-02 17:55:12 +01:00
quota: Use %pV and __attribute__((format (printf in __quota_error and fix fallout
2011-01-10 19:04:05 +01:00
mm: migration: use rcu_dereference_protected when dereferencing the radix tree slot during file page migration
2011-01-13 17:32:48 -08:00
Staging: sep: handle the rar definition stuff in the header
2010-11-29 11:17:22 -08:00
rcu: remove unused __list_for_each_rcu() macro
2010-12-17 12:34:59 -08:00
kernel: add bl_list
2011-01-07 17:50:31 +11:00
rcu: increase synchronize_sched_expedited() batching
2010-12-17 12:34:08 -08:00
rcu,cleanup: move synchronize_sched_expedited() out of sched.c
2010-11-29 22:01:58 -08:00
rcu,cleanup: move synchronize_sched_expedited() out of sched.c
2010-11-29 22:01:58 -08:00
BKL: remove extraneous #include <smp_lock.h>
2010-11-17 08:59:32 -08:00
fs: provide rcu-walk aware permission i_ops
2011-01-07 17:50:29 +11:00
rapidio: add definitions of Component Tag fields
2011-01-13 08:03:18 -08:00
rapidio: use common destid storage for endpoints and switches
2011-01-13 08:03:17 -08:00
rapidio: add new idt sRIO switches
2011-01-13 08:03:18 -08:00
thp: transparent hugepage core
2011-01-13 17:32:42 -08:00
romfs: have romfs_fs.h pull in necessary headers
2011-01-13 08:03:23 -08:00
rtc: Namespace fixup
2010-12-13 22:48:21 +01:00
net: rtnetlink.h -- only include linux/netdevice.h when used by the kernel
2010-11-15 11:29:30 -08:00
thp: khugepaged
2011-01-13 17:32:43 -08:00
Merge branch 'master' into next
2011-01-10 09:46:24 +11:00
kernel: optimise seqlock
2011-01-07 17:50:27 +11:00
pps: unify timestamp gathering
2011-01-13 08:03:19 -08:00
omap: Serial: Define register access modes in LCR
2010-11-30 14:11:49 -08:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
2011-01-13 15:06:28 +09:00
net: Introduce skb_checksum_start_offset()
2010-12-16 14:43:14 -08:00
kernel: kmem_ptr_validate considered harmful
2011-01-07 17:50:16 +11:00
tracing/slab: Move kmalloc tracepoint out of inline code
2010-11-28 21:16:28 +02:00
Fix build failure due to hwirq.h needing smp_lock.h
2010-11-17 14:58:36 -08:00
tcp: Replace time wait bucket msg by counter
2010-12-08 12:16:33 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2011-01-13 10:25:58 -08:00
sony-laptop: support new hotkeys on the P, Z and EC series
2011-01-10 12:00:22 -05:00
x86: Eliminate bp argument from the stack tracing routines
2010-11-18 14:37:34 +01:00
stmmac: add init/exit callback in plat_stmmacenet_data struct
2010-11-24 11:14:24 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-01-13 10:05:56 -08:00
thp: transparent hugepage core
2011-01-13 17:32:42 -08:00
tracing: Remove useless syscall ftrace_event_call declaration
2010-11-18 14:37:45 +01:00
taskstats: pad taskstats netlink response for aligment issues on ia64
2010-12-22 19:43:34 -08:00
pps: capture MONOTONIC_RAW timestamps as well
2011-01-13 08:03:21 -08:00
timerqueue: Make timerqueue_getnext() static inline
2010-12-11 12:34:34 +01:00
ntp: add hardpps implementation
2011-01-13 08:03:20 -08:00
tipc: cleanup various cosmetic whitespace issues
2011-01-01 13:57:56 -08:00
tipc: cleanup various cosmetic whitespace issues
2011-01-01 13:57:56 -08:00
toshiba.h: hide a function prototypes behind __KERNEL__ macro
2011-01-13 08:03:08 -08:00
key: add tpm_send command
2010-11-29 08:55:22 +11:00
keys: add new trusted key-type
2010-11-29 08:55:25 +11:00
tracepoint: Add __rcu annotation
2011-01-07 20:57:22 -05:00
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2010-12-02 12:58:16 -08:00
tty: fix typos/errors in tty_driver.h comments
2010-12-16 13:14:32 -08:00
pps: timestamp is always passed to dcd_change()
2011-01-13 08:03:20 -08:00
Kill off a bunch of warning: ‘inline’ is not at beginning of declaration
2010-11-28 23:08:04 +01:00
Input: introduce device properties
2010-12-20 09:37:33 +01:00
Merge branch 'usb-next' into musb-merge
2010-12-16 10:05:06 -08:00
user_ns: improve the user_ns on-the-slab packaging
2011-01-13 08:03:18 -08:00
vga_switcheroo: fix build with non switcheroo enabled path.
2011-01-06 13:05:04 +10:00
ACPI: video: fix build for VIDEO_OUTPUT_CONTROL=n
2010-12-11 02:01:35 -05:00
mm: unify module_alloc code for vmalloc
2011-01-13 17:32:34 -08:00
mm: vmstat: use a single setter function and callback for adjusting percpu thresholds
2011-01-13 17:32:31 -08:00
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2011-01-07 16:58:04 -08:00
Smack: Transmute labels on specified directories
2010-12-07 14:04:02 -08:00
xfrm: Add Traffic Flow Confidentiality padding XFRM attribute
2010-12-10 14:43:58 -08:00
decompressors: add XZ decompressor module
2011-01-13 08:03:24 -08:00
