commit d89b218b801fd93ea95880f1c7fde348cbcc51c5 Merge: 80a1860 bec68ff Author: Linus Torvalds Date: Sat Mar 13 14:50:18 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (108 commits) bridge: ensure to unlock in error path in br_multicast_query(). drivers/net/tulip/eeprom.c: fix bogus "(null)" in tulip init messages sky2: Avoid rtnl_unlock without rtnl_lock ipv6: Send netlink notification when DAD fails drivers/net/tg3.c: change the field used with the TG3_FLAG_10_100_ONLY constant ipconfig: Handle devices which take some time to come up. mac80211: Fix memory leak in ieee80211_if_write() mac80211: Fix (dynamic) power save entry ipw2200: use kmalloc for large local variables ath5k: read eeprom IQ calibration values correctly for G mode ath5k: fix I/Q calibration (for real) ath5k: fix TSF reset ath5k: use fixed antenna for tx descriptors libipw: split ieee->networks into small pieces mac80211: Fix sta_mtx unlocking on insert STA failure path rt2x00: remove KSEG1ADDR define from rt2x00soc.h net: add ColdFire support to the smc91x driver asix: fix setting mac address for AX88772 ipv6 ip6_tunnel: eliminate unused recursion field from ip6_tnl{}. net: Fix dev_mc_add() ... commit 80a186074e72e2cd61f6716d90cf32ce54981a56 Merge: 15c989d 3d07467 Author: Linus Torvalds Date: Sat Mar 13 14:46:18 2010 -0800 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Fix pick_next_highest_task_rt() for cgroups sched: Cleanup: remove unused variable in try_to_wake_up() x86: Fix sched_clock_cpu for systems with unsynchronized TSC commit 15c989d4d14b82f43cae7efc6a7794cdd556f274 Merge: 4e3eadd 0e152cd Author: Linus Torvalds Date: Sat Mar 13 14:45:49 2010 -0800 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, k8 nb: Fix boot crash: enable k8_northbridges unconditionally on AMD systems x86, UV: Fix target_cpus() in x2apic_uv_x.c x86: Reduce per cpu warning boot up messages x86: Reduce per cpu MCA boot up messages x86_64, cpa: Don't work hard in preserving kernel 2M mappings when using 4K already commit 4e3eaddd142e2142c048c5052a0a9d2604fccfc6 Merge: 8655e7e b97c4bc Author: Linus Torvalds Date: Sat Mar 13 14:43:01 2010 -0800 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: locking: Make sparse work with inline spinlocks and rwlocks x86/mce: Fix RCU lockdep splats rcu: Increase RCU CPU stall timeouts if PROVE_RCU ftrace: Replace read_barrier_depends() with rcu_dereference_raw() rcu: Suppress RCU lockdep warnings during early boot rcu, ftrace: Fix RCU lockdep splat in ftrace_perf_buf_prepare() rcu: Suppress __mpol_dup() false positive from RCU lockdep rcu: Make rcu_read_lock_sched_held() handle !PREEMPT rcu: Add control variables to lockdep_rcu_dereference() diagnostics rcu, cgroup: Relax the check in task_subsys_state() as early boot is now handled by lockdep-RCU rcu: Use wrapper function instead of exporting tasklist_lock sched, rcu: Fix rcu_dereference() for RCU-lockdep rcu: Make task_subsys_state() RCU-lockdep checks handle boot-time use rcu: Fix holdoff for accelerated GPs for last non-dynticked CPU x86/gart: Unexport gart_iommu_aperture Fix trivial conflicts in kernel/trace/ftrace.c commit 8655e7e3ddec60603c4f6c14cdf642e2ba198df8 Merge: 461d208 b634587 Author: Linus Torvalds Date: Sat Mar 13 14:40:50 2010 -0800 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing: Do not record user stack trace from NMI context tracing: Disable buffer switching when starting or stopping trace tracing: Use same local variable when resetting the ring buffer function-graph: Init curr_ret_stack with ret_stack ring-buffer: Move disabled check into preempt disable section function-graph: Add tracing_thresh support to function_graph tracer tracing: Update the comm field in the right variable in update_max_tr function-graph: Use comment notation for func names of dangling '}' function-graph: Fix unused reference to ftrace_set_func() tracing: Fix warning in s_next of trace file ops tracing: Include irqflags headers from trace clock commit 461d208cfbd1f0af26027b2c35ded515e54b1ee6 Merge: 9fdfbc2 0e49887 Author: Linus Torvalds Date: Sat Mar 13 14:39:54 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Sound MSI fallout on a Asus mobo NVIDIA MCP55 sound: fix opti92x-ad1848 build ALSA: hda - Fix input source elements of secondary ADCs on Realtek ALSA: hda - Fix wrong model range check for ALC268 commit 9fdfbc2bff587f454dd95e2caa6d147c9abe39e4 Merge: 8cea4eb dc1d628 Author: Linus Torvalds Date: Sat Mar 13 14:39:42 2010 -0800 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf: Provide generic perf_sample_data initialization MAINTAINERS: Add Arnaldo as tools/perf/ co-maintainer perf trace: Don't use pager if scripting perf trace/scripting: Remove extraneous header read perf, ARM: Modify kuser rmb() call to compile for Thumb-2 x86/stacktrace: Don't dereference bad frame pointers perf archive: Don't try to collect files without a build-id perf_events, x86: Fixup fixed counter constraints perf, x86: Restrict the ANY flag perf, x86: rename macro in ARCH_PERFMON_EVENTSEL_ENABLE perf, x86: add some IBS macros to perf_event.h perf, x86: make IBS macros available in perf_event.h hw-breakpoints: Remove stub unthrottle callback x86/hw-breakpoints: Remove the name field perf: Remove pointless breakpoint union perf lock: Drop the buffers multiplexing dependency perf lock: Fix and add misc documentally things percpu: Add __percpu sparse annotations to hw_breakpoint commit 8cea4eb642890a1de58980e7e1617d1765ef8f7c Merge: 122ce87 720e774 Author: Linus Torvalds Date: Sat Mar 13 14:38:53 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: GFS2: Skip check for mandatory locks when unlocking GFS2: Allow the number of committed revokes to temporarily be negative GFS2: do not select QUOTA commit 122ce878dc189860a380539bde19498bf93443a7 Merge: daf9fe2 0636b33 Author: Linus Torvalds Date: Sat Mar 13 14:38:31 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: RDMA/nes: Fix CX4 link problem in back-to-back configuration RDMA/nes: Clear stall bit before destroying NIC QP RDMA/nes: Set assume_aligned_header bit RDMA/cxgb3: Wait at least one schedule cycle during device removal IB/mad: Ignore iWARP devices on device removal IPoIB: Include return code in trace message for ib_post_send() failures IPoIB: Fix TX queue lockup with mixed UD/CM traffic commit bec68ff1637ca00bb1585a03a7be8a13380084de Author: YOSHIFUJI Hideaki Date: Sat Mar 13 12:27:21 2010 -0800 bridge: ensure to unlock in error path in br_multicast_query(). Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit c251c7f738cd94eb3a1febda318078c661eccb4d Author: Joe Perches Date: Sat Mar 13 12:26:15 2010 -0800 drivers/net/tulip/eeprom.c: fix bogus "(null)" in tulip init messages On Wed, 2010-03-10 at 08:41 -0800, David Miller wrote: > From: Mikael Pettersson > Date: Wed, 10 Mar 2010 16:33:28 +0100 > > Booting 2.6.34-rc1 on a machine with a tulip nic I see > > a number of kernel messages that include "(null)" where > > previous kernels included the string "tulip0": > CC:'ing the guilty party :-) It's one of the following > commits: Thanks Mikael. Anonymity has some good attributes. Blame avoidance is one of them. I've broad shoulders. It's me, then Dwight Howard... There might be another few of these where ->name or ->dev was used before struct device or net_device was registered. I'll go back and check. tulip_core has: if (tp->flags & HAS_MEDIA_TABLE) { sprintf(dev->name, DRV_NAME "%d", board_idx); /* hack */ tulip_parse_eeprom(dev); strcpy(dev->name, "eth%d"); /* un-hack */ } So I don't feel _too_ bad. tulip_parse_eeprom is done before register_netdev so the logging there can not use netdev_ or dev_(&dev->dev Signed-off-by: Joe Perches Tested-by: Mikael Pettersson Signed-off-by: David S. Miller commit 2a40018984c5c9647df1c18489449a3a227d9136 Author: Mike McCormack Date: Sat Mar 13 12:24:18 2010 -0800 sky2: Avoid rtnl_unlock without rtnl_lock Make sure we always call rtnl_lock before going down the error path in sky2_resume, which unlocks the rtnl lock. Signed-off-by: Mike McCormack Signed-off-by: David S. Miller commit e2577a065832f2c6d108de2e027891bdb2d78924 Author: Herbert Xu Date: Sat Mar 13 12:23:29 2010 -0800 ipv6: Send netlink notification when DAD fails If we are managing IPv6 addresses using DHCP, it would be nice for user-space to be notified if an address configured through DHCP fails DAD. Otherwise user-space would have to poll to see whether DAD succeeds. This patch uses the existing notification mechanism and simply hooks it into the DAD failure code path. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 3f07d1295191cfa41125e4e61ee2064790070071 Author: Julia Lawall Date: Sat Mar 13 12:22:16 2010 -0800 drivers/net/tg3.c: change the field used with the TG3_FLAG_10_100_ONLY constant The constant TG3_FLAG_10_100_ONLY should be used with the tg3_flags field, not the tg3_flags2 field, as done elsewhere in the same file. Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit a003460b21323ddb29479505d9555f0985b8b2f1 Merge: 964ad81 dee6026 Author: David S. Miller Date: Sat Mar 13 12:17:09 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 0e152cd7c16832bd5cadee0c2e41d9959bc9b6f9 Author: Borislav Petkov Date: Fri Mar 12 15:43:03 2010 +0100 x86, k8 nb: Fix boot crash: enable k8_northbridges unconditionally on AMD systems de957628ce7c84764ff41331111036b3ae5bad0f changed setting of the x86_init.iommu.iommu_init function ptr only when GART IOMMU is found. One side effect of it is that num_k8_northbridges is not initialized anymore if not explicitly called. This resulted in uninitialized pointers in , for example, which uses the num_k8_northbridges thing through node_to_k8_nb_misc(). Fix that through an initcall that runs right after the PCI subsystem and does all the scanning. Then, remove initialization in gart_iommu_init() which is a rootfs_initcall and we're running before that. What is more, since num_k8_northbridges is being used in other places beside GART IOMMU, include it whenever we add AMD CPU support. The previous dependency chain in kconfig contained K8_NB depends on AGP_AMD64|GART_IOMMU which was clearly incorrect. The more natural way in terms of hardware dependency should be AGP_AMD64|GART_IOMMU depends on K8_NB depends on CPU_SUP_AMD && PCI. Make it so Number One! Signed-off-by: Borislav Petkov Cc: FUJITA Tomonori Cc: Joerg Roedel LKML-Reference: <20100312144303.GA29262@aftab> Signed-off-by: Ingo Molnar Tested-by: Joerg Roedel commit b6345879ccbd9b92864fbd7eb8ac48acdb4d6b15 Author: Steven Rostedt Date: Fri Mar 12 20:03:30 2010 -0500 tracing: Do not record user stack trace from NMI context A bug was found with Li Zefan's ftrace_stress_test that caused applications to segfault during the test. Placing a tracing_off() in the segfault code, and examining several traces, I found that the following was always the case. The lock tracer was enabled (lockdep being required) and userstack was enabled. Testing this out, I just enabled the two, but that was not good enough. I needed to run something else that could trigger it. Running a load like hackbench did not work, but executing a new program would. The following would trigger the segfault within seconds: # echo 1 > /debug/tracing/options/userstacktrace # echo 1 > /debug/tracing/events/lock/enable # while :; do ls > /dev/null ; done Enabling the function graph tracer and looking at what was happening I finally noticed that all cashes happened just after an NMI. 1) | copy_user_handle_tail() { 1) | bad_area_nosemaphore() { 1) | __bad_area_nosemaphore() { 1) | no_context() { 1) | fixup_exception() { 1) 0.319 us | search_exception_tables(); 1) 0.873 us | } [...] 1) 0.314 us | __rcu_read_unlock(); 1) 0.325 us | native_apic_mem_write(); 1) 0.943 us | } 1) 0.304 us | rcu_nmi_exit(); [...] 1) 0.479 us | find_vma(); 1) | bad_area() { 1) | __bad_area() { After capturing several traces of failures, all of them happened after an NMI. Curious about this, I added a trace_printk() to the NMI handler to read the regs->ip to see where the NMI happened. In which I found out it was here: ffffffff8135b660 : ffffffff8135b660: 48 83 ec 78 sub $0x78,%rsp ffffffff8135b664: e8 97 01 00 00 callq ffffffff8135b800 What was happening is that the NMI would happen at the place that a page fault occurred. It would call rcu_read_lock() which was traced by the lock events, and the user_stack_trace would run. This would trigger a page fault inside the NMI. I do not see where the CR2 register is saved or restored in NMI handling. This means that it would corrupt the page fault handling that the NMI interrupted. The reason the while loop of ls helped trigger the bug, was that each execution of ls would cause lots of pages to be faulted in, and increase the chances of the race happening. The simple solution is to not allow user stack traces in NMI context. After this patch, I ran the above "ls" test for a couple of hours without any issues. Without this patch, the bug would trigger in less than a minute. Cc: stable@kernel.org Reported-by: Li Zefan Signed-off-by: Steven Rostedt commit a2f8071428ed9a0f06865f417c962421c9a6b488 Author: Steven Rostedt Date: Fri Mar 12 19:56:00 2010 -0500 tracing: Disable buffer switching when starting or stopping trace When the trace iterator is read, tracing_start() and tracing_stop() is called to stop tracing while the iterator is processing the trace output. These functions disable both the standard buffer and the max latency buffer. But if the wakeup tracer is running, it can switch these buffers between the two disables: buffer = global_trace.buffer; if (buffer) ring_buffer_record_disable(buffer); <<<--------- swap happens here buffer = max_tr.buffer; if (buffer) ring_buffer_record_disable(buffer); What happens is that we disabled the same buffer twice. On tracing_start() we can enable the same buffer twice. All ring_buffer_record_disable() must be matched with a ring_buffer_record_enable() or the buffer can be disable permanently, or enable prematurely, and cause a bug where a reset happens while a trace is commiting. This patch protects these two by taking the ftrace_max_lock to prevent a switch from occurring. Found with Li Zefan's ftrace_stress_test. Cc: stable@kernel.org Reported-by: Lai Jiangshan Signed-off-by: Steven Rostedt commit 283740c619d211e34572cc93c8cdba92ccbdb9cc Author: Steven Rostedt Date: Fri Mar 12 19:48:41 2010 -0500 tracing: Use same local variable when resetting the ring buffer In the ftrace code that resets the ring buffer it references the buffer with a local variable, but then uses the tr->buffer as the parameter to reset. If the wakeup tracer is running, which can switch the tr->buffer with the max saved buffer, this can break the requirement of disabling the buffer before the reset. buffer = tr->buffer; ring_buffer_record_disable(buffer); synchronize_sched(); __tracing_reset(tr->buffer, cpu); If the tr->buffer is swapped, then the reset is not happening to the buffer that was disabled. This will cause the ring buffer to fail. Found with Li Zefan's ftrace_stress_test. Cc: stable@kernel.org Reported-by: Lai Jiangshan Signed-off-by: Steven Rostedt commit ea14eb714041d40fcc5180b5a586034503650149 Author: Steven Rostedt Date: Fri Mar 12 19:41:23 2010 -0500 function-graph: Init curr_ret_stack with ret_stack If the graph tracer is active, and a task is forked but the allocating of the processes graph stack fails, it can cause crash later on. This is due to the temporary stack being NULL, but the curr_ret_stack variable is copied from the parent. If it is not -1, then in ftrace_graph_probe_sched_switch() the following: for (index = next->curr_ret_stack; index >= 0; index--) next->ret_stack[index].calltime += timestamp; Will cause a kernel OOPS. Found with Li Zefan's ftrace_stress_test. Cc: stable@kernel.org Signed-off-by: Steven Rostedt commit 52fbe9cde7fdb5c6fac196d7ebd2d92d05ef3cd4 Author: Lai Jiangshan Date: Mon Mar 8 14:50:43 2010 +0800 ring-buffer: Move disabled check into preempt disable section The ring buffer resizing and resetting relies on a schedule RCU action. The buffers are disabled, a synchronize_sched() is called and then the resize or reset takes place. But this only works if the disabling of the buffers are within the preempt disabled section, otherwise a window exists that the buffers can be written to while a reset or resize takes place. Cc: stable@kernel.org Reported-by: Li Zefan Signed-off-by: Lai Jiangshan LKML-Reference: <4B949E43.2010906@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit daf9fe2ee9a203c4fc555cfe5c5f3d9f660e743c Merge: 9d85929 8d002bd Author: Linus Torvalds Date: Fri Mar 12 16:41:09 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: mfd: Several MFD drivers should depend on GENERIC_HARDIRQS mfd: Fix sm501 requested region size commit 9d85929fefd040ca84a5e04ee704d043efcc3c2e Merge: 6db823c eeb5b4a Author: Linus Torvalds Date: Fri Mar 12 16:35:21 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6: fat: Fix stat->f_namelen fat: Fix vfat_lookup() commit 6db823cf4b44f235b5e1da8ec1fe3c3cd63647fe Author: Linus Torvalds Date: Fri Mar 12 16:30:23 2010 -0800 Fix up .gitignore for top-level file patterns Some of the gitignore file patters were explicitly meant to be only for the top level, but weren't marked that way, so they would trigger recursively in subdirectories too. Normally that was harmless, but at least "linux" happened to trigger elsewhere too. Fix it up. And other patterns in that section weren't necessarily top-level at all. Reported-by: Jiri Slaby Signed-off-by: Linus Torvalds commit 64d5aea30062ce9f3ce7c62be8ae65e776cbfee2 Merge: 3836a03 ad6759f Author: Linus Torvalds Date: Fri Mar 12 16:27:08 2010 -0800 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: timekeeping: Prevent oops when GENERIC_TIME=n commit 3836a03d978e68b0ae00d3589089343c998cd4ff Author: Eric Paris Date: Tue Mar 9 22:23:01 2010 -0500 anon_inodes: mark the anon inode private Inotify was switched to use anon_inode instead of its own private filesystem which only had one inode in commit c44dcc56d2b5c7 "switch inotify_user to anon_inode" The problem with this is that now the inotify inode is not a distinct inode which can be managed by LSMs. userspace tools which use inotify were allowed to use the inotify inode but may not have had permission to do read/write type operations on the anon_inode. After looking at the anon_inode and its users it looks like the best solution is to just mark the anon_inode as S_PRIVATE so the security system will ignore it. Signed-off-by: Eric Paris Acked-by: James Morris Signed-off-by: Linus Torvalds commit 83c0fb6500b13c9b7564fe453b76356dc58415d4 Merge: 11bfe2e 3a065fc Author: Linus Torvalds Date: Fri Mar 12 16:22:50 2010 -0800 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6: udf: use ext2_find_next_bit udf: Do not read inode before writing it udf: Fix unalloc space handling in udf_update_inode commit 11bfe2ea732c6499c46c4f3a63d567c05b9dbafd Merge: b6fedfd 5b8a2fb Author: Linus Torvalds Date: Fri Mar 12 16:21:24 2010 -0800 Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm * 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm: msm_sdcc.c: missing brackets in msmsdcc_resume() commit b97c4bc16734a2e597dac7f91ee9eb78f4aeef9a Author: Luca Barbieri Date: Thu Mar 11 14:08:45 2010 -0800 locking: Make sparse work with inline spinlocks and rwlocks Currently sparse does not work with inline spinlock and rwlock functions. The problem is that they do not use the __acquires/__releases out-of-line functions, but use inline functions with no sparse annotations. This patch adds the appropriate annotations to make it work properly. Signed-off-by: Luca Barbieri Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit b6fedfd2a18a489d31246312f7279f82e3cc6b37 Merge: c32da02 30124d1 Author: Linus Torvalds Date: Fri Mar 12 16:06:51 2010 -0800 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/booke: Fix breakpoint/watchpoint one-shot behavior powerpc: Reduce printk from pseries_mach_cpu_die() powerpc: Move checks in pseries_mach_cpu_die() powerpc: Reset kernel stack on cpu online from cede state powerpc: Fix G5 thermal shutdown powerpc/pseries: Pass CPPR value to H_XIRR hcall powerpc/booke: Fix a couple typos in the advanced ptrace code powerpc: Fix SMP build with disabled CPU hotplugging. powerpc: Dynamically allocate pacas powerpc/perf: e500 support powerpc/perf: Build callchain code regardless of hardware event support. powerpc/cpm2: Checkpatch cleanup powerpc/86xx: Renaming following split of GE Fanuc joint venture powerpc/86xx: Convert gef_pic_lock to raw_spinlock powerpc/qe: Convert qe_ic_lock to raw_spinlock powerpc/82xx: Convert pci_pic_lock to raw_spinlock powerpc/85xx: Convert socrates_fpga_pic_lock to raw_spinlock commit c32da02342b7521df25fefc2ef20aee0e61cf887 Merge: dca1d9f 318ae2e Author: Linus Torvalds Date: Fri Mar 12 16:04:50 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits) doc: fix typo in comment explaining rb_tree usage Remove fs/ntfs/ChangeLog doc: fix console doc typo doc: cpuset: Update the cpuset flag file Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed Remove drivers/parport/ChangeLog Remove drivers/char/ChangeLog doc: typo - Table 1-2 should refer to "status", not "statm" tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h devres/irq: Fix devm_irq_match comment Remove reference to kthread_create_on_cpu tree-wide: Assorted spelling fixes tree-wide: fix 'lenght' typo in comments and code drm/kms: fix spelling in error message doc: capitalization and other minor fixes in pnp doc devres: typo fix s/dev/devm/ Remove redundant trailing semicolons from macros fix typo "definetly" -> "definitely" in comment tree-wide: s/widht/width/g typo in comments ... Fix trivial conflict in Documentation/laptops/00-INDEX commit dca1d9f6d7ae428c193f32bd3e9a4ca13176648b Merge: 9ff9933 91e0138 Author: Linus Torvalds Date: Fri Mar 12 16:00:54 2010 -0800 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (370 commits) ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock ARM: S3C2443: Remove #if 0 for clk_mpll ARM: S3C2443: Update notes on MPLLREF clock ARM: S3C2443: Further clksrc-clk conversions ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation USB: Fix s3c-hsotg build following Samsung platform header moves ARM: S3C64XX: Reintroduce unconditional build of audio device ARM: 5961/1: ux500: fix CLKRST addresses ARM: 5977/1: arm: Enable backtrace printing on oops when PC is corrupted ASoC: Fix S3C64xx IIS driver for Samsung header reorg ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support [ARM] pxa: fix typo in mxm8x10.h [ARM] pxa/raumfeld: set GPIO drive bits for LED pins [ARM] pxa/zeus: Add support for mcp2515 CAN bus [ARM] pxa/zeus: Add support for onboard max6369 watchdog [ARM] pxa/zeus: Add Eurotech as the manufacturer [ARM] pxa/zeus: Correct the USB host initialisation flags [ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress [ARM] pxa: refactor uncompress.h for non-PXA uarts [ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs ... commit 9ff99339447de403a46be5e3f23d0c794d540b06 Author: Dave Young Date: Wed Mar 10 15:24:10 2010 -0800 sysctl extern cleanup: poll Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move epoll_table extern declaration to linux/poll.h Signed-off-by: Dave Young Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2edf5e49800846a2b2b6461d99cdae18067c440f Author: Dave Young Date: Wed Mar 10 15:24:10 2010 -0800 sysctl extern cleanup: lockdep Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move lockdep extern declarations to linux/lockdep.h Signed-off-by: Dave Young Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f0e056fdebc15d3f4724ebc7bbf323158add1d7 Author: Dave Young Date: Wed Mar 10 15:24:09 2010 -0800 sysctl extern cleanup: rtmutex Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move max_lock_depth extern declaration to linux/rtmutex.h Signed-off-by: Dave Young Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c55b7c3e82d0ad58f35a0785faaaf2f70b9b6cd3 Author: Dave Young Date: Wed Mar 10 15:24:08 2010 -0800 sysctl extern cleanup: acct Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move acct_parm extern declaration to linux/acct.h Signed-off-by: Dave Young Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15485a4682d1d3bfee2aa78b4b1a5d36f5746b64 Author: Dave Young Date: Wed Mar 10 15:24:07 2010 -0800 sysctl extern cleanup: sg Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move sg_big_buff extern declaration to scsi/sg.h Signed-off-by: Dave Young Acked-by: Doug Gilbert Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ed109103d73b0bafc92e860cead56725231384d Author: Dave Young Date: Wed Mar 10 15:24:06 2010 -0800 sysctl extern cleanup: module Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move modprobe_path extern declaration to linux/kmod.h Move modules_disabled extern declaration to linux/module.h Signed-off-by: Dave Young Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5ab67726f33b50f40db0ccf271ceb3c658554d5 Author: Dave Young Date: Wed Mar 10 15:24:05 2010 -0800 sysctl extern cleanup: rcu Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move rcutorture_runnable extern declaration to linux/rcupdate.h Signed-off-by: Dave Young Acked-by: Josh Triplett Reviewed-by: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d33ed52d57e794eba55cea3f5eab3c8f80b6cb5a Author: Dave Young Date: Wed Mar 10 15:23:59 2010 -0800 sysctl extern cleanup: signal Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move print_fatal_signals extern declaration to linux/signal.h Signed-off-by: Dave Young Cc: Oleg Nesterov Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb5572fed55f4c2b7dbc42582bc82dcb47632380 Author: Dave Young Date: Wed Mar 10 15:23:59 2010 -0800 sysctl extern cleanup: C_A_D Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move C_A_D extern variable declaration to linux/reboot.h Signed-off-by: Dave Young Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d759c3745e62c36fd7efee7a2ce2a327f22e9056 Author: Vladimir Zapolskiy Date: Wed Mar 10 15:23:57 2010 -0800 mxcmmc: fixed max_seg_size value on initialization This unpleasant typo appeared while porting the driver from Freescale original sources, where anyone can easily find the correct version. Current incorrect version potentially can influence segment and merge handling in block subsystem via MMC request queue settings. Signed-off-by: Vladimir Zapolskiy Cc: Sascha Hauer Cc: Pierre Ossman Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51ea3f6a4571e9283e2ff79b74bcedfc2986dbe2 Author: Joakim Tjernlund Date: Wed Mar 10 15:23:57 2010 -0800 inflate_fast: sout is already a short so ptr arith was off by one. inflate_fast() can do either POST INC or PRE INC on its pointers walking the memory to decompress. Default is PRE INC. The sout pointer offset was miscalculated in one case as the calculation assumed sout was a char * This breaks inflate_fast() iff configured to do POST INC. Signed-off-by: Joakim Tjernlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e69eae65523b457a3ac4262a66cfff57f2c924a9 Author: Joakim Tjernlund Date: Wed Mar 10 15:23:55 2010 -0800 zlib: make new optimized inflate endian independent Commit 6846ee5ca68d81e6baccf0d56221d7a00c1be18b ("zlib: Fix build of powerpc boot wrapper") made the new optimized inflate only available on arch's that define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS. This patch will again enable the optimization for all arch's by defining our own endian independent version of unaligned access. As an added bonus, arch's that define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS do a plain load instead. Signed-off-by: Joakim Tjernlund Cc: Anton Blanchard Cc: Benjamin Herrenschmidt Cc: David Woodhouse Cc: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ceaa2f39bfa73c4398cd01e78f1c3ebde3d3383 Author: Russell King Date: Wed Mar 10 15:23:53 2010 -0800 decompress: fix new decompressor for PIC The ARM kernel decompressor wants to be able to relocate r/w data independently from the rest of the image, and we do this by ensuring that r/w data has global visibility. Define STATIC_RW_DATA to be empty to achieve this. Signed-off-by: Russell King Cc: Alain Knaff Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c1840f15feecb6961f480cad1a7a8e53a3f2ba6 Author: Akinobu Mita Date: Wed Mar 10 15:23:52 2010 -0800 sgi-gru: use for_each_set_bit() Replace open-coded loop with for_each_set_bit(). Signed-off-by: Akinobu Mita Cc: Jack Steiner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fbcae222b8aa3a47034a484e02e7fc14050c783 Author: Julia Lawall Date: Wed Mar 10 15:23:52 2010 -0800 drivers/char/mmtimer.c: eliminate useless code The variable x is initialized twice to the same (side effect-free) expression. Drop one initialization. A simplified version of the semantic match that finds this problem is: (http://coccinelle.lip6.fr/) // @forall@ idexpression *x; identifier f!=ERR_PTR; @@ x = f(...) ... when != x ( x = f(...,<+...x...+>,...) | * x = f(...) ) // Stefan observed: The next x = rb_entry(mn->next, struct mmtimer, list); is preceded by a test whether mn->next is NULL. Unless that test is redundant too, your patch fixes a potential NULL pointer dereference, introduced by commit cbacdd95 "SGI Altix mmtimer: allow larger number of timers per node" in 2.6.26. Signed-off-by: Julia Lawall Cc: Stefan Richter Cc: Dimitri Sivanich Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 582ef52a5d5650931f6d76c81d824bd98419ac8a Author: Alberto Panizzo Date: Wed Mar 10 15:23:50 2010 -0800 w1: mxc_w1: move probe() and remove() to the dev* text area This fixes the section mismatch warning for mxc_w1_probe() Cc: Evgeniy Polyakov Cc: Sascha Hauer Acked-by: Uwe Kleine-König Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6786073927c3ff3eb7fc3d2192e761e86fa0d352 Author: Roel Kluin Date: Wed Mar 10 15:23:49 2010 -0800 w1: fix test in ds2482_wait_1wire_idle() With `while (++retries < DS2482_WAIT_IDLE_TIMEOUT)' retries reaches DS2482_WAIT_IDLE_TIMEOUT after the loop Signed-off-by: Roel Kluin Cc: Evgeniy Polyakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ed63d5eb4c0de0321f5c0a7328e132a78f9fafe Author: Rodolfo Giometti Date: Wed Mar 10 15:23:48 2010 -0800 serial amba-pl010: enable PPS support Function pl010_enable_ms() is automagically called when PPS ldisc is selected. Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc77f161aa5e81ddaf38390094c4f2ca3814e6b1 Author: Rodolfo Giometti Date: Wed Mar 10 15:23:48 2010 -0800 serial 8250: enable PPS support Automagically function serial8250_enable_ms() is called when PPS ldisc is selected. Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0880df0ccde8d551fc4d88c455acb2ee0801e26 Author: Rodolfo Giometti Date: Wed Mar 10 15:23:47 2010 -0800 pps: serial clients support Adds support, by using the PPS line discipline, for the PPS sources connected with the CD (Carrier Detect) pin of a serial port. [akpm@linux-foundation.org: fix cast size warnings] Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 572b9adbd40b5565dc413db04af9cc234f72bf19 Author: Rodolfo Giometti Date: Wed Mar 10 15:23:46 2010 -0800 ldisc n_tty: add new method n_tty_inherit_ops() This new method can be used to init a new struct tty_ldisc_ops as the default tty_ldisc_N_TTY struct. Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3e63afe8a74c0134d05a551cc74facc3b3ec0d7 Author: Rodolfo Giometti Date: Wed Mar 10 15:23:45 2010 -0800 ldisc: new dcd_change() method for line disciplines Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 697fb85fcf21b5229a3072440222d14b05ef2abe Author: Rodolfo Giometti Date: Wed Mar 10 15:23:45 2010 -0800 pps: LinuxPPS clients support Each PPS source can be registered/deregistered into the system by using special modules called "clients". They simply define the PPS sources' attributes and implement the time signal registration mechanism. This patch adds a special directory for such clients and adds a dummy client that can be useful to test system integrity on real systems. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51e7364ef281e540371f084008732b13292622f0 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:44 2010 -0800 Documentation: rename PCI-DMA-mapping.txt to DMA-API-HOWTO.txt Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: "David S. Miller" Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5a69f4c1319c03b946e1e99a590b6002aa3e5ef Author: FUJITA Tomonori Date: Wed Mar 10 15:23:43 2010 -0800 Documentation: remove the PCI DMA API description in DMA-API.txt - remove the PCI DMA API description in DMA-API.txt - remove the descriptions of dma_unmap macros since PCI-DMA-mapping.txt has the same description. Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: "David S. Miller" Reviewed-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 216bf58f4092df33262bea498f0460657f4842a4 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:42 2010 -0800 Documentation: convert PCI-DMA-mapping.txt to use the generic DMA API - replace the PCI DMA API (i.e. pci_dma_*) with the generic DMA API. - make the document more generic (use the PCI specific explanation as an example). [akpm@linux-foundation.org: fix things Randy noticed] Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: "David S. Miller" Reviewed-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f3cd1e0bb452c31a306a3e764514ea2eaf7d2e0 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:41 2010 -0800 dma-mapping: pci: move pci_set_dma_mask and pci_set_consistent_dma_mask to pci-dma-compat.h We can use pci-dma-compat.h to implement pci_set_dma_mask and pci_set_consistent_dma_mask as we do with the other PCI DMA API. We can remove HAVE_ARCH_PCI_SET_DMA_MASK too. Signed-off-by: FUJITA Tomonori Cc: Jesse Barnes Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6fee48cd330c68332f9712bc968d934a1a84a32a Author: FUJITA Tomonori Date: Wed Mar 10 15:23:40 2010 -0800 dma-mapping: arm: use generic pci_set_dma_mask and pci_set_consistent_dma_mask This converts arm to the generic pci_set_dma_mask and pci_set_consistent_dma_mask (removes HAVE_ARCH_PCI_SET_DMA_MASK for dmabounce). Signed-off-by: FUJITA Tomonori Looked-over-by: Russell King Cc: Jesse Barnes Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e6c70e6910d21443ab0f894bab52b9ea653ef27 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:40 2010 -0800 dma-mapping: powerpc: use generic pci_set_dma_mask and pci_set_consistent_dma_mask This converts powerpc to use the generic pci_set_dma_mask and pci_set_consistent_dma_mask (drivers/pci/pci.c). The generic pci_set_dma_mask does what powerpc's pci_set_dma_mask does. Unlike powerpc's pci_set_consistent_dma_mask, the gneric pci_set_consistent_dma_mask sets only coherent_dma_mask. It doesn't work for powerpc? pci_set_consistent_dma_mask API should set only coherent_dma_mask? Signed-off-by: FUJITA Tomonori Acked-by: Benjamin Herrenschmidt Cc: Jesse Barnes Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a1961f49ee8d7339ea2454443dfc0460e0b2748 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:39 2010 -0800 dma-mapping: dma-mapping.h: add dma_set_coherent_mask dma_set_coherent_mask corresponds to pci_set_consistent_dma_mask. This is necessary to move to the generic device model DMA API from the PCI bus specific API in the long term. dma_set_coherent_mask works in the exact same way that pci_set_consistent_dma_mask does. So this patch also changes pci_set_consistent_dma_mask to call dma_set_coherent_mask. Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: David S. Miller Cc: Jesse Barnes Cc: Benjamin Herrenschmidt Cc: Russell King Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3c4bccabaf3e5c13f4b307c7737cbe8d0cecd02 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:38 2010 -0800 dma-mapping: pci: convert pci_set_dma_mask to call dma_set_mask This changes pci_set_dma_mask to call the generic DMA API, dma_set_mask. pci_set_dma_mask (in drivers/pci/pci.c) does the same things that dma_set_mask does on all the architectures that use pci_set_dma_mask; calls dma_supprted and sets dev->dma_mask. So we safely change pci_set_dma_mask to simply call dma_set_mask. Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: David S. Miller Cc: Jesse Barnes Acked-by: Benjamin Herrenschmidt Cc: Russell King Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c186caca3dbe7f44da624cb4f9d78e1b1dfb13b8 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:37 2010 -0800 dma-mapping: alpha: use include/linux/pci-dma-compat.h This converts Alpha to use include/linux/pci-dma-compat.h. Alpha is the only architecutre that implements the PCI DMA API in the own way. That makes it difficult to implement the generic DMA API via the PCI bus specific DMA API. The generic DMA API calls the PCI DMA API implementation in arch/alpha/kernel/pci_iommu.c on non Jensen systems. It calls the DMA API in arch/alpha/kernel/pci-noop.c on Jensen systems. Signed-off-by: FUJITA Tomonori Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Cc: Jesse Barnes Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 349004294c365cb99a0ee84149286d6f29b1e6b9 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:35 2010 -0800 dma-mapping: sparc: unify 32bit and 64bit dma_set_mask This patchset transforms the PCI DMA API into the generic device model. It's one of the reasons why we introduced the generic DMA API long ago; driver writers are always able to use the generic DMA API with any bus instead of using bus specific DMA APIs such as pci_map_single, sbus_map_single, etc (only two bus specific APIs exist now; pci and ssb). Some of the PCI DMA API are already implented on the top of the generic DMA API (include/asm-generic/pci-dma-compat.h). But there are some exceptions. This patchset finishes the transformation. This patch: sparc has two dma_set_mask implementations for 32bit and 64bit. They are same except for the error returned value. We can safely unify them since the error returned value doesn't matter as long as it is negative (as DMA-API.txt describes). This patch also changes dma_set_mask not to call pci_set_dma_mask. Instead, dma_set_mask does the same thing that pci_set_dma_mask does. This change enables ut to change pci_set_dma_mask to call dma_set_mask; we can implement pci_set_dma_mask as pci-dma-compat.h does. Signed-off-by: FUJITA Tomonori Acked-by: David Miller Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Cc: James Bottomley Cc: Jesse Barnes Cc: Benjamin Herrenschmidt Cc: Russell King Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06db881b4f1b5fb8fff563423f76b7361de8281a Author: FUJITA Tomonori Date: Wed Mar 10 15:23:33 2010 -0800 dma-mapping: mn10300: remove the obsolete and unnecessary DMA API comments pci_dma_sync_single was obsoleted long ago. All the comments are generic, not architecture specific, simply describes some of the DMA-API (and the same comments are in other files). Documentation/DMA-API.txt have more detailed descriptions. This removes the above obsolete and unnecessary DMA API comments. Let's describe the DMA API in only Documentation/DMA-API.txt. Signed-off-by: FUJITA Tomonori Cc: David Howells Cc: Koichi Yasutake Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b4f767af73d50ab9ce3a92f254eb290f5e5507c Author: FUJITA Tomonori Date: Wed Mar 10 15:23:32 2010 -0800 dma-mapping: blackfin: remove the obsolete and unnecessary DMA API comments pci_dma_sync_single was obsoleted long ago. All the comments are generic, not architecture specific, simply describes some of the DMA-API (and the same comments are in other files). Documentation/DMA-API.txt have more detailed descriptions. This removes the above obsolete and unnecessary DMA API comments. Let's describe the DMA API in only Documentation/DMA-API.txt. Signed-off-by: FUJITA Tomonori Cc: Mike Frysinger Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 027491f4b2ff15fe5cc36c900cb2d1fdb35cefdd Author: FUJITA Tomonori Date: Wed Mar 10 15:23:32 2010 -0800 dma-mapping: frv: remove the obsolete and unnecessary DMA API comments pci_dma_sync_single was obsoleted long ago. All the comments are generic, not architecture specific, simply describes some of the DMA-API (and frv has the same comments in three files). Documentation/DMA-API.txt have more detailed descriptions. This removes the above obsolete and unnecessary DMA API comments. Let's describe the DMA API in only Documentation/DMA-API.txt. Signed-off-by: FUJITA Tomonori Cc: David Howells Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0acedc124aca35f5cce9d4ee288dc372bf517e09 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:31 2010 -0800 dma-mapping.h: add the dma_unmap state API Adds the following macros: DECLARE_DMA_UNMAP_ADDR(ADDR_NAME) DECLARE_DMA_UNMAP_LEN(LEN_NAME) dma_unmap_addr(PTR, ADDR_NAME) dma_unmap_addr_set(PTR, ADDR_NAME, VAL) dma_unmap_len(PTR, LEN_NAME) dma_unmap_len_set(PTR, LEN_NAME, VAL) The API corresponds to the pci_unmap state API. We'll move to this new generic API from the PCI specific API in the long term. As include/asm-generic/pci-dma-compat.h does, the pci_unmap API simply calls the new generic API for some time. Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: David S. Miller Cc: Jesse Barnes Cc: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f41b177157718abe9a93868bb76e47d4a6f3681d Author: FUJITA Tomonori Date: Wed Mar 10 15:23:30 2010 -0800 pci-dma: add linux/pci-dma.h to linux/pci.h All the architectures properly set NEED_DMA_MAP_STATE now so we can safely add linux/pci-dma.h to linux/pci.h and remove the linux/pci-dma.h inclusion in arch's asm/pci.h Signed-off-by: FUJITA Tomonori Acked-by: Arnd Bergmann Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7e67ac1f329fa28b6a411335787c786de618cba Author: FUJITA Tomonori Date: Wed Mar 10 15:23:29 2010 -0800 pci-dma: cris: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: Mikael Starvik Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 479ea1e90c2b052de793a80ecc5eceab480f44ff Author: FUJITA Tomonori Date: Wed Mar 10 15:23:28 2010 -0800 pci-dma: xtensa: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Chris Zankel Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d15b51be6f3a04762522c8ee9ac6a3a02752c0ed Author: FUJITA Tomonori Date: Wed Mar 10 15:23:28 2010 -0800 pci-dma: sparc: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: David S. Miller Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5cabbb6277286adf973fbb30aca9b194922a316e Author: FUJITA Tomonori Date: Wed Mar 10 15:23:27 2010 -0800 pci-dma: sh: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: Paul Mundt Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af407c6db16aa9ca63559076dbe620220a822580 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:27 2010 -0800 pci-dma: powerpc: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Benjamin Herrenschmidt Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74a0bd66a3f78cb993144aaf336ce115017a0b5c Author: FUJITA Tomonori Date: Wed Mar 10 15:23:26 2010 -0800 pci-dma: parisc: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: Kyle McMartin Cc: Helge Deller Cc: James Bottomley Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1e02b329d64353e67af070516a9bd14caff8bb0 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:25 2010 -0800 pci-dma: mips: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Ralf Baechle Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66ed5ef8b44374def8461a0a05d4afc34d4ad684 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:25 2010 -0800 pci-dma: ia64: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Tony Luck Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 272ecbe5919d057388bbbea751fad5471aaf3f02 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:24 2010 -0800 pci-dma: frv: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: David Howells Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ccd7ab7f7efb4cb94b4a000ba220a0aeefe9bc11 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:23 2010 -0800 pci-dma: arm: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: Russell King Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08d925badd63a4e335905066152d96b83266987c Author: FUJITA Tomonori Date: Wed Mar 10 15:23:23 2010 -0800 pci-dma: alpha: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Richard Henderson Cc: Ivan Kokshaysky Acked-by: Matt Turner Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bc4e4590de89c2dfcfb1000344cd072574c9ad4 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:22 2010 -0800 pci-dma: x86: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5637f2df8d56b64697c1ee5c96cf0d6b650b30cb Author: FUJITA Tomonori Date: Wed Mar 10 15:23:21 2010 -0800 pci-dma: add include/linux/pci-dma.h This patch adds include/linux/pci-dma.h that defines the pci_unmap state API: DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) DECLARE_PCI_UNMAP_LEN(LEN_NAME) pci_unmap_addr(PTR, ADDR_NAME) pci_unmap_addr_set(PTR, ADDR_NAME, VAL) pci_unmap_len(PTR, LEN_NAME) pci_unmap_len_set(PTR, LEN_NAME, VAL) This enables us to remove lots of the duplication in architecture implementations since there are only two ways to define the API. If architectures define CONFIG_NEED_DMA_MAP_STATE, they get the real definition of pci_unmap state API. If not, they get the noop definition. In the long term, it's better to replace the API with the generic device model API such as DECLARE_DMA_UNMAP_ADDR. We can map the API to the generic one (like dma-mapping-compat.h does). This patch also makes the migration process easier. We can remove this file after the migration. It might be simpler to add the API to include/linux/pci.h but looks it's already too large. We'll remove pci-dma.h after finishing moving to the generic device model. So I put the API to a separate file. Signed-off-by: FUJITA Tomonori Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Acked-by: Russell King Acked-by: David Howells Cc: Tony Luck Cc: Ralf Baechle Cc: Kyle McMartin Cc: Helge Deller Cc: James Bottomley Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: David S. Miller Cc: Chris Zankel Acked-by: Arnd Bergmann Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 771cb3ecfb4d2858a7583be83caf27726f6c3002 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:19 2010 -0800 um: remove dma_sync_single_range dma_sync_single_for_cpu/for_device supports a partial sync so there is no point to have dma_sync_single_range (also dma_sync_single was obsoleted long ago, replaced with dma_sync_single_for_cpu/for_device). There is no user of dma_sync_single_range() in mainline and only Alpha architecture supports dma_sync_single_range(). So it's unlikely that someone out of the tree uses it. Signed-off-by: FUJITA Tomonori Cc: Jeff Dike Acked-by: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d2efd0800ee7a7c71ae8748d759bb5eb4b71839 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:19 2010 -0800 alpha: remove dma_sync_single_range dma_sync_single_for_cpu/for_device supports a partial sync so there is no point to have dma_sync_single_range (also dma_sync_single was obsoleted long ago, replaced with dma_sync_single_for_cpu/for_device). There is no user of dma_sync_single_range() in mainline and only Alpha architecture supports dma_sync_single_range(). So it's unlikely that someone out of the tree uses it. Signed-off-by: FUJITA Tomonori Cc: Richard Henderson Cc: Ivan Kokshaysky Acked-by: Matt Turner Acked-by: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8127bfc5645db0e050468e0ff971b4081f73ddcf Author: FUJITA Tomonori Date: Wed Mar 10 15:23:18 2010 -0800 DMA-API.txt: remove dma_sync_single_range description dma_sync_single_for_cpu/for_device supports a partial sync so there is no point to have dma_sync_single_range (also dma_sync_single was obsoleted long ago, replaced with dma_sync_single_for_cpu/for_device). There is no user of dma_sync_single_range() in mainline and only Alpha architecture supports dma_sync_single_range(). So it's unlikely that someone out of the tree uses it. Signed-off-by: FUJITA Tomonori Acked-by: David Miller Acked-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9705ef7ec8c67a62474291bb4b235927bdf702db Author: FUJITA Tomonori Date: Wed Mar 10 15:23:17 2010 -0800 DMA-API.txt: add dma_sync_single/sg API description This adds the description of the following eight function: dma_sync_single_for_cpu pci_dma_sync_single_for_cpu dma_sync_single_for_device pci_dma_sync_single_for_device dma_sync_sg_for_cpu pci_dma_sync_sg_for_cpu dma_sync_sg_for_device pci_dma_sync_sg_for_device It was unclear that the API permits a partial sync (some network drivers already do though). I made it clear that the sync_single API can do a partial sync but the sync_sg API can't. We could do a partial sync with the sync_sg API too, however, it's difficult for driver writers to correctly use the sync_sg API for a partial sync since the scatterlists passed in to the mapping API can't be modified. It's unlikely that driver writers want to do a partial sync with the sync_sg API (because the sync_sg API are usually used for block drivers). So I think that it's better to forbid a partial sync with the sync_sg API. Signed-off-by: FUJITA Tomonori Acked-by: David Miller Acked-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 039956e9199b71ea673954e025f52f319110ca58 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:15 2010 -0800 Documentation/DMA-API.txt: remove deprecated function descriptions dma_sync_single(), pci_dma_sync_single(), dma_sync_sg(), and pci_dma_sync_sg() are deprecated. We should not advertise them. Signed-off-by: FUJITA Tomonori Acked-by: David S. Miller Acked-by: Joerg Roedel Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8004fd2ad6042ae24d3913cf5089909781db3a25 Author: Peter Tyser Date: Wed Mar 10 15:23:15 2010 -0800 edac: e752x: add dram scrubbing support Add support to scrub DRAM using the e752x integrated memory scrubbing engine. The e7320/7520/e7525 chipsets support scrubbing at one rate while the i3100 chipset supports a normal and fast rate. A similar patch was originally sent back in 2008: http://sourceforge.net/mailarchive/forum.php?thread_name=1204835866.25206.70.camel@localhost.localdomain&forum_name=bluesmoke-devel This version has the following updates: - Use 16-bit PCI config cycles to access MCHSCRB register e7320/7520/e7525 docs say register is 16bits wide, i3100 says 8. I tested 16bits on the i3100 to be safe. - Recalcuate and round actual scrub rates The changes have been tested on an i3100-based board. Signed-off-by: Peter Tyser Signed-off-by: Doug Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8de5c1a165be5624a1003ce17877299e04b2afd6 Author: Konstantin Olifer Date: Wed Mar 10 15:23:14 2010 -0800 edac: e752x fsb ecc FSB parity is only supported on the Xeon processor. Previously it was incorrectly enabled for the Celeron as well. Signed-off-by: Konstantin Olifer Signed-off-by: Doug Thompson Cc: Peter Tyser Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66ed3f7516da31205aed9b47a13348c0d982c4f5 Author: H Hartley Sweeten Date: Wed Mar 10 15:23:13 2010 -0800 edac: mpc85xx use resource_size instead of raw math Use resource_size() instead of arithmetic. Signed-off-by: H Hartley Sweeten Signed-off-by: Doug Thompson Acked-by: Dave Jiang Cc: Peter Tyser Cc: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dcca7c3d003ce61ed71b412f645cfbe7bd8e882e Author: Peter Tyser Date: Wed Mar 10 15:23:12 2010 -0800 edac: mpc85xx improve SDRAM error reporting Add the ability to detect the specific data line or ECC line which failed when printing out SDRAM single-bit errors. An example of a single-bit SDRAM ECC error is below: EDAC MPC85xx MC1: Err Detect Register: 0x80000004 EDAC MPC85xx MC1: Faulty data bit: 59 EDAC MPC85xx MC1: Expected Data / ECC: 0x7f80d000_409effa0 / 0x6d EDAC MPC85xx MC1: Captured Data / ECC: 0x7780d000_409effa0 / 0x6d EDAC MPC85xx MC1: Err addr: 0x00031ca0 EDAC MPC85xx MC1: PFN: 0x00000031 Knowning which specific data or ECC line caused an error can be useful in tracking down hardware issues such as improperly terminated signals, loose pins, etc. Note that this feature is only currently enabled for 64-bit wide data buses, 32-bit wide bus support should be added. I don't have any 32-bit wide systems to test on. If someone has one and is willing to give this patch a shot with the check for a 64-bit data bus removed it would be much appreciated and I can re-submit with both 32 and 64 bit buses supported. Signed-off-by: Peter Tyser Signed-off-by: Doug Thompson Cc: Kumar Gala Cc: Dave Jiang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21768639be419d00275ac4e58b863361d0c24ee4 Author: Peter Tyser Date: Wed Mar 10 15:23:11 2010 -0800 edac: mpc85xx mask ecc syndrome correctly With a 64-bit wide data bus only the lowest 8-bits of the ECC syndrome are relevant. With a 32-bit wide data bus only the lowest 16-bits are relevant on most architectures. Without this change, the ECC syndrome displayed can be mildly confusing, eg: EDAC MPC85xx MC1: syndrome: 0x25252525 When in reality the ECC syndrome is 0x25. A variety of Freescale manuals say a variety of different things about how to decode the CAPTURE_ECC (syndrome) register. I don't have a system with a 32-bit bus to test on, but I believe the change is correct. It'd be good to get an ACK from someone at Freescale about this change though. Signed-off-by: Peter Tyser Signed-off-by: Doug Thompson Cc: Kumar Gala Cc: Dave Jiang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8467005da3ef6104b89a4cc5e9c9d9445b75565f Author: Alexey Dobriyan Date: Wed Mar 10 15:23:10 2010 -0800 nsproxy: remove INIT_NSPROXY() Remove INIT_NSPROXY(), use C99 initializer. Remove INIT_IPC_NS(), INIT_NET_NS() while I'm at it. Note: headers trim will be done later, now it's quite pointless because results will be invalidated by merge window. Signed-off-by: Alexey Dobriyan Acked-by: Serge Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13aa9a6b0f2371d2ce0de57c2ede62ab7a787157 Author: Oleg Nesterov Date: Wed Mar 10 15:23:09 2010 -0800 pid_ns: zap_pid_ns_processes: use SEND_SIG_NOINFO instead of force_sig() zap_pid_ns_processes() uses force_sig(SIGKILL) to ensure SIGKILL will be delivered to sub-namespace inits as well. This is correct, but we are going to change force_sig_info() semantics. See http://bugzilla.kernel.org/show_bug.cgi?id=15395#c31 We can use send_sig_info(SEND_SIG_NOINFO) instead, since 614c517d7c00af1b26ded20646b329397d6f51a1 ("signals: SEND_SIG_NOINFO should be considered as SI_FROMUSER()") SEND_SIG_NOINFO means "from user" and therefore send_signal() will get the correct from_ancestor_ns = T flag. Signed-off-by: Oleg Nesterov Acked-by: Serge Hallyn Acked-by: Linus Torvalds Acked-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6edb6764409392836b44a61b06d94954efd6200f Author: Corey Minyard Date: Wed Mar 10 15:23:07 2010 -0800 ipmi: remove ipmi_smi.h self-include There is no need for linux/ipmi_smi.h to include itself. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f95d51308a72288d877c3c8dc4597c9a93f7344 Author: Bela Lubkin Date: Wed Mar 10 15:23:07 2010 -0800 ipmi: fix slave_addrs setting to actually work Actually use the slave_addrs module parameter if it is specified, and make things consistent about passing zero in for the slave address for the default. Signed-off-by: Bela Lubkin Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae74e823cb7d4cd476f623fce9a38f625f6c09a8 Author: Martin Wilck Date: Wed Mar 10 15:23:06 2010 -0800 ipmi: add parameter to limit CPU usage in kipmid In some cases kipmid can use a lot of CPU. This adds a way to tune the CPU used by kipmid to help in those cases. By setting kipmid_max_busy_us to a value between 100 and 500, it is possible to bring down kipmid CPU load to practically 0 without loosing too much ipmi throughput performance. Not setting the value, or setting the value to zero, operation is unaffected. Signed-off-by: Martin Wilck Signed-off-by: Corey Minyard Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1eb1332b8f07e937add24c6fd2ac40b8737a2f4 Author: Jiri Slaby Date: Wed Mar 10 15:23:05 2010 -0800 ipc: use rlimit helpers Make sure compiler won't do weird things with limits. E.g. fetching them twice may return 2 different values after writable limits are implemented. I.e. either use rlimit helpers added in 3e10e716abf3c71bdb5d86b8f507f9e72236c9cd ("resource: add helpers for fetching rlimits") or ACCESS_ONCE if not applicable. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6db2ade10852b7c665b361239c3411abaa880b5 Author: Veaceslav Falico Date: Wed Mar 10 15:23:04 2010 -0800 copy_signal() cleanup: clean tty_audit_fork() Remove unneeded initialization in tty_audit_fork(). It is called only via copy_signal() and is useless after the kmem_cache_zalloc() was used. Signed-off-by: Veaceslav Falico Cc: Roland McGrath Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93c59907c6f247d09239135caecf294a106a2ae0 Author: Veaceslav Falico Date: Wed Mar 10 15:23:03 2010 -0800 copy_signal() cleanup: clean thread_group_cputime_init() Remove unneeded initializations in thread_group_cputime_init() and in posix_cpu_timers_init_group(). They are useless after kmem_cache_zalloc() was used in copy_signal(). Signed-off-by: Veaceslav Falico Acked-by: Oleg Nesterov Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4dd66e69d472f0ba5355a2529364d0db9a18a02b Author: Veaceslav Falico Date: Wed Mar 10 15:23:02 2010 -0800 copy_signal() cleanup: kill taskstats_tgid_init() and acct_init_pacct() Kill unused functions taskstats_tgid_init() and acct_init_pacct() because we don't use them anywhere after using kmem_cache_zalloc() in copy_signal(). Signed-off-by: Veaceslav Falico Cc: Roland McGrath Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a56704ef6b0c5796c9ff38cc78aa232dfb9644d7 Author: Veaceslav Falico Date: Wed Mar 10 15:23:01 2010 -0800 copy_signal() cleanup: use zalloc and remove initializations Use kmem_cache_zalloc() on signal creation and remove unneeded initialization lines in copy_signal(). Signed-off-by: Veaceslav Falico Acked-by: Oleg Nesterov Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e34112e3966fc466ced2698e6c196bb50b1ee20e Author: Christoph Hellwig Date: Wed Mar 10 15:23:01 2010 -0800 m32r: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't, which is consistent with all architectures using the modern ptrace code. The old code only disables the breakpoints on PTRACE_KILL, while after this patch this also happens for PTRACE_CONT and PTRACE_SYSCALL which matches the behaviour of the other architetures. I think this is a bugfixes, but please double verify this is correct. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 290ba3aef58ff21c977585ff6b687e457f80bf54 Author: Christoph Hellwig Date: Wed Mar 10 15:23:00 2010 -0800 cris arch-v32: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. The way breakpoints are disabled is entirely inconsistent currently, I tried to make some sense of it, but I suspect all of the content of ptrace_disable should be moved into user_disable_single_step, this defintively needs some revisting as the current patch changes behaviour in not quite designed ways. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Mikael Starvik Cc: Jesper Nilsson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8313809ef3bfa8fa366d416add2150787235f192 Author: Christoph Hellwig Date: Wed Mar 10 15:22:58 2010 -0800 cris arch-v10: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT and PTRACE_KILL. This also makes PTRACE_SINGLESTEP return -EIO while it previously succeeded despite not actually causing any kind of single stepping. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Mikael Starvik Cc: Jesper Nilsson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d75ca10225be4c7509026f9b61c740b22e734e4 Author: Christoph Hellwig Date: Wed Mar 10 15:22:57 2010 -0800 xtensa: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1bd095083558928cc3b36b826422d69bcd743dca Author: Christoph Hellwig Date: Wed Mar 10 15:22:56 2010 -0800 um: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. XXX: I'm not sure arch_has_single_step() is placed in the exactly correct location, please verify in which of the ptrace headers it should really be. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55436c91652b45be576b91ec96a8d65f6b7447fa Author: Christoph Hellwig Date: Wed Mar 10 15:22:55 2010 -0800 mips: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT and PTRACE_KILL. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa1ac57a317f927b8fb901e6270fc41fdaae8e1c Author: Christoph Hellwig Date: Wed Mar 10 15:22:54 2010 -0800 microblaze: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT and PTRACE_KILL. This also makes PTRACE_SINGLESTEP return -EIO while it previously succeeded despite not actually causing any kind of single stepping. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: Michal Simek Cc: John Williams Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a0fde8b3b16fcfb2bb4a136c53918f1ca9b35cc Author: Christoph Hellwig Date: Wed Mar 10 15:22:53 2010 -0800 m68knommu: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. m68knommu already defines the nessecary user_enable_single_step and user_disable_single_step functions for this. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 857fb252a1858ccded2e31ee98c6c0ab79c07999 Author: Christoph Hellwig Date: Wed Mar 10 15:22:52 2010 -0800 h8300: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d8393171b1f6c30a889fd7cb16fc193f689923c Author: Christoph Hellwig Date: Wed Mar 10 15:22:51 2010 -0800 avr32: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Currently avr32 doesn't implement any code to disable single stepping when one of the non-syscall requests is called which seems wrong, but I've left it as-is for now. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: Haavard Skinnemoen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 440e6ca79aebdc274ce4c625a6f42c8bf3c7bc91 Author: Christoph Hellwig Date: Wed Mar 10 15:22:50 2010 -0800 arm: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't and the single stepping disable only happens if the tracee process isn't a zombie yet, which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd341abba65e3d93fc24c132e4c0278d18b6d2fc Author: Christoph Hellwig Date: Wed Mar 10 15:22:47 2010 -0800 alpha: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't, which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: Matt Turner Cc: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dacbe41f776db0a5a9aee1e41594f405c95778a5 Author: Christoph Hellwig Date: Wed Mar 10 15:22:46 2010 -0800 ptrace: move user_enable_single_step & co prototypes to linux/ptrace.h While in theory user_enable_single_step/user_disable_single_step/ user_enable_blockstep could also be provided as an inline or macro there's no good reason to do so, and having the prototype in one places keeps code size and confusion down. Roland said: The original thought there was that user_enable_single_step() et al might well be only an instruction or three on a sane machine (as if we have any of those!), and since there is only one call site inlining would be beneficial. But I agree that there is no strong reason to care about inlining it. As to the arch changes, there is only one thought I'd add to the record. It was always my thinking that for an arch where PTRACE_SINGLESTEP does text-modifying breakpoint insertion, user_enable_single_step() should not be provided. That is, arch_has_single_step()=>true means that there is an arch facility with "pure" semantics that does not have any unexpected side effects. Inserting a breakpoint might do very unexpected strange things in multi-threaded situations. Aside from that, it is a peculiar side effect that user_{enable,disable}_single_step() should cause COW de-sharing of text pages and so forth. For PTRACE_SINGLESTEP, all these peculiarities are the status quo ante for that arch, so having arch_ptrace() itself do those is one thing. But for building other things in the future, it is nicer to have a uniform "pure" semantics that arch-independent code can expect. OTOH, all such arch issues are really up to the arch maintainer. As of today, there is nothing but ptrace using user_enable_single_step() et al so it's a distinction without a practical difference. If/when there are other facilities that use user_enable_single_step() and might care, the affected arch's can revisit the question when someone cares about the quality of the arch support for said new facility. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3c1e01a09d6af2dd7811a066ffcfc5171be2bed Author: Christoph Hellwig Date: Wed Mar 10 15:22:44 2010 -0800 ptrace: use ptrace_request() in the remaining architectures Use ptrace_request() in the three remaining architectures that didn't use it (m68knommu, h8300, microblaze). This means: - ptrace_request now handles PTRACE_{PEEK,POKE}{TEXT,DATA} and PTRACE_DETATCH calls that were previously called directly, or in case of h8300 even open coded. - adds new support for PTRACE_SETOPTIONS/PTRACE_GETEVENTMSG/ PTRACE_GETSIGINFO/PTRACE_SETSIGINFO Signed-off-by: Christoph Hellwig Cc: Geert Uytterhoeven Cc: Yoshinori Sato Cc: Oleg Nesterov Cc: Michal Simek Acked-by: Greg Ungerer Acked-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7baab93f9297da3e42a8cecfbf91d5f22f415500 Author: Miao Xie Date: Wed Mar 10 15:22:42 2010 -0800 nodemask: fix the declaration of NODEMASK_ALLOC() we can't declarate two variable at the same scope by NODEMASK_ALLOC(). This patch fixes it. Signed-off-by: Miao Xie Cc: David Rientjes Cc: Lee Schermerhorn Cc: Nick Piggin Cc: Paul Menage Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a38374b8bd482b1e7c25f830772e9b73337ec2ed Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:40 2010 -0800 memcg: update maintainer list Nishimura-san have been working for memcg very good. His review and tests give us much improvements and account migraiton which he is now challenging is really important. He is a stakeholder. Signed-off-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Acked-by: Pavel Emelyanov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 867578cbccb0893cc14fc29c670f7185809c90d6 Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:39 2010 -0800 memcg: fix oom kill behavior In current page-fault code, handle_mm_fault() -> ... -> mem_cgroup_charge() -> map page or handle error. -> check return code. If page fault's return code is VM_FAULT_OOM, page_fault_out_of_memory() is called. But if it's caused by memcg, OOM should have been already invoked. Then, I added a patch: a636b327f731143ccc544b966cfd8de6cb6d72c6. That patch records last_oom_jiffies for memcg's sub-hierarchy and prevents page_fault_out_of_memory from being invoked in near future. But Nishimura-san reported that check by jiffies is not enough when the system is terribly heavy. This patch changes memcg's oom logic as. * If memcg causes OOM-kill, continue to retry. * remove jiffies check which is used now. * add memcg-oom-lock which works like perzone oom lock. * If current is killed(as a process), bypass charge. Something more sophisticated can be added but this pactch does fundamental things. TODO: - add oom notifier - add permemcg disable-oom-kill flag and freezer at oom. - more chances for wake up oom waiter (when changing memory limit etc..) Reviewed-by: Daisuke Nishimura Tested-by: Daisuke Nishimura Signed-off-by: KAMEZAWA Hiroyuki Cc: Balbir Singh Cc: David Rientjes Signed-off-by: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0263c12c12ccc90edc9d856fa839f8936183e6d1 Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:37 2010 -0800 memcg: fix typos in memcg_test.txt Signed-off-by: Kirill A. Shutemov Reviewed-by: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e111452d457ceedec8a57fc3d45b1312e736fba Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:36 2010 -0800 memcg: update memcg_test.txt to describe memory thresholds Decription of sanity check for memory thresholds. Signed-off-by: Kirill A. Shutemov Acked-by: KAMEZAWA Hiroyuki Cc: Paul Menage Cc: Li Zefan Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d8fd973a41942bc760dd21581e24117bc1dd063 Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:35 2010 -0800 cgroups: add simple listener of cgroup events to documentation An example of cgroup notification API usage. Signed-off-by: Kirill A. Shutemov Reviewed-by: KAMEZAWA Hiroyuki Cc: Paul Menage Cc: Li Zefan Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0a4db548edcce067c1201ef25cf2bc29f32dca4 Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:34 2010 -0800 cgroups: remove events before destroying subsystem state objects Events should be removed after rmdir of cgroup directory, but before destroying subsystem state objects. Let's take reference to cgroup directory dentry to do that. Signed-off-by: Kirill A. Shutemov Acked-by: KAMEZAWA Hiroyuki Cc: Paul Menage Acked-by: Li Zefan Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ab78683c17d739c2a2077141dcf81a02b7fb57e Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:34 2010 -0800 cgroups: fix race between userspace and kernelspace Notify userspace about cgroup removing only after rmdir of cgroup directory to avoid race between userspace and kernelspace. eventfd are used to notify about two types of event: - control file-specific, like crossing memory threshold; - cgroup removing. To understand what really happen, userspace can check if the cgroup still exists. To avoid race beetween userspace and kernelspace we have to notify userspace about cgroup removing only after rmdir of cgroup directory. Signed-off-by: Kirill A. Shutemov Reviewed-by: KAMEZAWA Hiroyuki Cc: Paul Menage Acked-by: Li Zefan Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit daaf1e68874c078a15ae6ae827751839c4d81739 Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:32 2010 -0800 memcg: handle panic_on_oom=always case Presently, if panic_on_oom=2, the whole system panics even if the oom happend in some special situation (as cpuset, mempolicy....). Then, panic_on_oom=2 means painc_on_oom_always. Now, memcg doesn't check panic_on_oom flag. This patch adds a check. BTW, how it's useful ? kdump+panic_on_oom=2 is the last tool to investigate what happens in oom-ed system. When a task is killed, the sysytem recovers and there will be few hint to know what happnes. In mission critical system, oom should never happen. Then, panic_on_oom=2+kdump is useful to avoid next OOM by knowing precise information via snapshot. TODO: - For memcg, it's for isolate system's memory usage, oom-notiifer and freeze_at_oom (or rest_at_oom) should be implemented. Then, management daemon can do similar jobs (as kdump) or taking snapshot per cgroup. Signed-off-by: KAMEZAWA Hiroyuki Cc: Balbir Singh Cc: David Rientjes Cc: Nick Piggin Reviewed-by: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1080d7a30304d03b1d9fd530aacd8aece2d702a2 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:31 2010 -0800 memcg: update memcg_test.txt Update memcg_test.txt to describe how to test the move-charge feature. Signed-off-by: Daisuke Nishimura Acked-by: KAMEZAWA Hiroyuki Acked-by: Balbir Singh Cc: "Kirill A. Shutemov" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2265e6fa3f220ea5fd37522d13390e9675adcf7 Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:31 2010 -0800 memcg : share event counter rather than duplicate Memcg has 2 eventcountes which counts "the same" event. Just usages are different from each other. This patch tries to reduce event counter. Now logic uses "only increment, no reset" counter and masks for each checks. Softlimit chesk was done per 1000 evetns. So, the similar check can be done by !(new_counter & 0x3ff). Threshold check was done per 100 events. So, the similar check can be done by (!new_counter & 0x7f) ALL event checks are done right after EVENT percpu counter is updated. Signed-off-by: KAMEZAWA Hiroyuki Cc: Kirill A. Shutemov Cc: Balbir Singh Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 430e48631e72aeab74d844c57b441f98a2e36eee Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:30 2010 -0800 memcg: update threshold and softlimit at commit Presently, move_task does "batched" precharge. Because res_counter or css's refcnt are not-scalable jobs for memcg, try_charge_().. tend to be done in batched manner if allowed. Now, softlimit and threshold check their event counter in try_charge, but the charge is not a per-page event. And event counter is not updated at charge(). Moreover, precharge doesn't pass "page" to try_charge() and softlimit tree will be never updated until uncharge() causes an event." So the best place to check the event counter is commit_charge(). This is per-page event by its nature. This patch move checks to there. Signed-off-by: KAMEZAWA Hiroyuki Cc: Kirill A. Shutemov Cc: Balbir Singh Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c62b1a3b31b5e27a6c5c2e91cc5ce05fdb6344d0 Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:29 2010 -0800 memcg: use generic percpu instead of private implementation When per-cpu counter for memcg was implemneted, dynamic percpu allocator was not very good. But now, we have good one and useful macros. This patch replaces memcg's private percpu counter implementation with generic dynamic percpu allocator. The benefits are - We can remove private implementation. - The counters will be NUMA-aware. (Current one is not...) - This patch makes sizeof struct mem_cgroup smaller. Then, struct mem_cgroup may be fit in page size on small config. - About basic performance aspects, see below. [Before] # size mm/memcontrol.o text data bss dec hex filename 24373 2528 4132 31033 7939 mm/memcontrol.o [page-fault-throuput test on 8cpu/SMP in root cgroup] # /root/bin/perf stat -a -e page-faults,cache-misses --repeat 5 ./multi-fault-fork 8 Performance counter stats for './multi-fault-fork 8' (5 runs): 45878618 page-faults ( +- 0.110% ) 602635826 cache-misses ( +- 0.105% ) 61.005373262 seconds time elapsed ( +- 0.004% ) Then cache-miss/page fault = 13.14 [After] #size mm/memcontrol.o text data bss dec hex filename 23913 2528 4132 30573 776d mm/memcontrol.o # /root/bin/perf stat -a -e page-faults,cache-misses --repeat 5 ./multi-fault-fork 8 Performance counter stats for './multi-fault-fork 8' (5 runs): 48179400 page-faults ( +- 0.271% ) 588628407 cache-misses ( +- 0.136% ) 61.004615021 seconds time elapsed ( +- 0.004% ) Then cache-miss/page fault = 12.22 Text size is reduced. This performance improvement is not big and will be invisible in real world applications. But this result shows this patch has some good effect even on (small) SMP. Here is a test program I used. 1. fork() processes on each cpus. 2. do page fault repeatedly on each process. 3. after 60secs, kill all childredn and exit. (3 is necessary for getting stable data, this is improvement from previous one.) #define _GNU_SOURCE #include #include #include #include #include #include #include #include /* * For avoiding contention in page table lock, FAULT area is * sparse. If FAULT_LENGTH is too large for your cpus, decrease it. */ #define FAULT_LENGTH (2 * 1024 * 1024) #define PAGE_SIZE 4096 #define MAXNUM (128) void alarm_handler(int sig) { } void *worker(int cpu, int ppid) { void *start, *end; char *c; cpu_set_t set; int i; CPU_ZERO(&set); CPU_SET(cpu, &set); sched_setaffinity(0, sizeof(set), &set); start = mmap(NULL, FAULT_LENGTH, PROT_READ|PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0); if (start == MAP_FAILED) { perror("mmap"); exit(1); } end = start + FAULT_LENGTH; pause(); //fprintf(stderr, "run%d", cpu); while (1) { for (c = (char*)start; (void *)c < end; c += PAGE_SIZE) *c = 0; madvise(start, FAULT_LENGTH, MADV_DONTNEED); } return NULL; } int main(int argc, char *argv[]) { int num, i, ret, pid, status; int pids[MAXNUM]; if (argc < 2) return 0; setpgid(0, 0); signal(SIGALRM, alarm_handler); num = atoi(argv[1]); pid = getpid(); for (i = 0; i < num; ++i) { ret = fork(); if (!ret) { worker(i, pid); exit(0); } pids[i] = ret; } sleep(1); kill(-pid, SIGALRM); sleep(60); for (i = 0; i < num; i++) kill(pids[i], SIGKILL); for (i = 0; i < num; i++) waitpid(pids[i], &status, 0); return 0; } Signed-off-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Cc: Pavel Emelyanov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a6135b64fda39d931a79090f4da37f1c6da4a8c Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:25 2010 -0800 memcg: typo in comment to mem_cgroup_print_oom_info() s/mem_cgroup_print_mem_info/mem_cgroup_print_oom_info/ Signed-off-by: Kirill A. Shutemov Cc: Balbir Singh Cc: Pavel Emelyanov Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e72b6347c9459e6cff5634ddc815485bae6985f Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:24 2010 -0800 memcg: implement memory thresholds It allows to register multiple memory and memsw thresholds and gets notifications when it crosses. To register a threshold application need: - create an eventfd; - open memory.usage_in_bytes or memory.memsw.usage_in_bytes; - write string like " " to cgroup.event_control. Application will be notified through eventfd when memory usage crosses threshold in any direction. It's applicable for root and non-root cgroup. It uses stats to track memory usage, simmilar to soft limits. It checks if we need to send event to userspace on every 100 page in/out. I guess it's good compromise between performance and accuracy of thresholds. [akpm@linux-foundation.org: coding-style fixes] [nishimura@mxp.nes.nec.co.jp: fix documentation merge issue] Signed-off-by: Kirill A. Shutemov Cc: Li Zefan Cc: KAMEZAWA Hiroyuki Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Vladislav Buzov Cc: Daisuke Nishimura Cc: Alexander Shishkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 378ce724bc2a0ef1243e11c09d58a70bb6be007a Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:23 2010 -0800 memcg: rework usage of stats by soft limit Instead of incrementing counter on each page in/out and comparing it with constant, we set counter to constant, decrement counter on each page in/out and compare it with zero. We want to make comparing as fast as possible. On many RISC systems (probably not only RISC) comparing with zero is more effective than comparing with a constant, since not every constant can be immediate operand for compare instruction. Also, I've renamed MEM_CGROUP_STAT_EVENTS to MEM_CGROUP_STAT_SOFTLIMIT, since really it's not a generic counter. Signed-off-by: Kirill A. Shutemov Cc: Li Zefan Cc: KAMEZAWA Hiroyuki Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Vladislav Buzov Cc: Daisuke Nishimura Cc: Alexander Shishkin Cc: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 104f39284e830f425085886ef72c49aee6631575 Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:21 2010 -0800 memcg: extract mem_group_usage() from mem_cgroup_read() Helper to get memory or mem+swap usage of the cgroup. Signed-off-by: Kirill A. Shutemov Acked-by: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Pavel Emelyanov Cc: Dan Malek Cc: Vladislav Buzov Cc: Daisuke Nishimura Cc: Alexander Shishkin Cc: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0dea116876eefc9c7ca9c5d74fe665481e499fa3 Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:20 2010 -0800 cgroup: implement eventfd-based generic API for notifications This patchset introduces eventfd-based API for notifications in cgroups and implements memory notifications on top of it. It uses statistics in memory controler to track memory usage. Output of time(1) on building kernel on tmpfs: Root cgroup before changes: make -j2 506.37 user 60.93s system 193% cpu 4:52.77 total Non-root cgroup before changes: make -j2 507.14 user 62.66s system 193% cpu 4:54.74 total Root cgroup after changes (0 thresholds): make -j2 507.13 user 62.20s system 193% cpu 4:53.55 total Non-root cgroup after changes (0 thresholds): make -j2 507.70 user 64.20s system 193% cpu 4:55.70 total Root cgroup after changes (1 thresholds, never crossed): make -j2 506.97 user 62.20s system 193% cpu 4:53.90 total Non-root cgroup after changes (1 thresholds, never crossed): make -j2 507.55 user 64.08s system 193% cpu 4:55.63 total This patch: Introduce the write-only file "cgroup.event_control" in every cgroup. To register new notification handler you need: - create an eventfd; - open a control file to be monitored. Callbacks register_event() and unregister_event() must be defined for the control file; - write " " to cgroup.event_control. Interpretation of args is defined by control file implementation; eventfd will be woken up by control file implementation or when the cgroup is removed. To unregister notification handler just close eventfd. If you need notification functionality for a control file you have to implement callbacks register_event() and unregister_event() in the struct cftype. [kamezawa.hiroyu@jp.fujitsu.com: Kconfig fix] Signed-off-by: Kirill A. Shutemov Reviewed-by: KAMEZAWA Hiroyuki Paul Menage Cc: Li Zefan Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Vladislav Buzov Cc: Daisuke Nishimura Cc: Alexander Shishkin Cc: Davide Libenzi Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 483c30b514bd3037fa3f19fa42327c94c10f51c8 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:18 2010 -0800 memcg: improve performance in moving swap charge Try to reduce overheads in moving swap charge by: - Adds a new function(__mem_cgroup_put), which takes "count" as a arg and decrement mem->refcnt by "count". - Removed res_counter_uncharge, css_put, and mem_cgroup_put from the path of moving swap account, and consolidate all of them into mem_cgroup_clear_mc. We cannot do that about mc.to->refcnt. These changes reduces the overhead from 1.35sec to 0.9sec to move charges of 1G anonymous memory(including 500MB swap) in my test environment. Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 024914477e15ef8b17f271ec47f1bb8a589f0806 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:17 2010 -0800 memcg: move charges of anonymous swap This patch is another core part of this move-charge-at-task-migration feature. It enables moving charges of anonymous swaps. To move the charge of swap, we need to exchange swap_cgroup's record. In current implementation, swap_cgroup's record is protected by: - page lock: if the entry is on swap cache. - swap_lock: if the entry is not on swap cache. This works well in usual swap-in/out activity. But this behavior make the feature of moving swap charge check many conditions to exchange swap_cgroup's record safely. So I changed modification of swap_cgroup's recored(swap_cgroup_record()) to use xchg, and define a new function to cmpxchg swap_cgroup's record. This patch also enables moving charge of non pte_present but not uncharged swap caches, which can be exist on swap-out path, by getting the target pages via find_get_page() as do_mincore() does. [kosaki.motohiro@jp.fujitsu.com: fix ia64 build] [akpm@linux-foundation.org: fix typos] Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8033b97c9b5ef063e3f4bf2efe1cd0a22093aaff Author: Daisuke Nishimura Date: Wed Mar 10 15:22:16 2010 -0800 memcg: avoid oom during moving charge This move-charge-at-task-migration feature has extra charges on "to"(pre-charges) and "from"(left-over charges) during moving charge. This means unnecessary oom can happen. This patch tries to avoid such oom. Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 854ffa8d104e44111fec96764c0e0cb29223d54c Author: Daisuke Nishimura Date: Wed Mar 10 15:22:15 2010 -0800 memcg: improve performance in moving charge Try to reduce overheads in moving charge by: - Instead of calling res_counter_uncharge() against the old cgroup in __mem_cgroup_move_account() everytime, call res_counter_uncharge() at the end of task migration once. - removed css_get(&to->css) from __mem_cgroup_move_account() because callers should have already called css_get(). And removed css_put(&to->css) too, which was called by callers of move_account on success of move_account. - Instead of calling __mem_cgroup_try_charge(), i.e. res_counter_charge(), repeatedly, call res_counter_charge(PAGE_SIZE * count) in can_attach() if possible. - Instead of calling css_get()/css_put() repeatedly, make use of coalesce __css_get()/__css_put() if possible. These changes reduces the overhead from 1.7sec to 0.6sec to move charges of 1G anonymous memory in my test environment. Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ffef5feff4e4240e767d2f1144b1634a41762e3 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:14 2010 -0800 memcg: move charges of anonymous page This patch is the core part of this move-charge-at-task-migration feature. It implements functions to move charges of anonymous pages mapped only by the target task. Implementation: - define struct move_charge_struct and a valuable of it(mc) to remember the count of pre-charges and other information. - At can_attach(), get anon_rss of the target mm, call __mem_cgroup_try_charge() repeatedly and count up mc.precharge. - At attach(), parse the page table, find a target page to be move, and call mem_cgroup_move_account() about the page. - Cancel all precharges if mc.precharge > 0 on failure or at the end of task move. [akpm@linux-foundation.org: a little simplification] Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7dc74be032bfcaa2f9d9e4296ff5bbddfa9e2f19 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:13 2010 -0800 memcg: add interface to move charge at task migration In current memcg, charges associated with a task aren't moved to the new cgroup at task migration. Some users feel this behavior to be strange. These patches are for this feature, that is, for charging to the new cgroup and, of course, uncharging from the old cgroup at task migration. This patch adds "memory.move_charge_at_immigrate" file, which is a flag file to determine whether charges should be moved to the new cgroup at task migration or not and what type of charges should be moved. This patch also adds read and write handlers of the file. This patch also adds no-op handlers for this feature. These handlers will be implemented in later patches. And you cannot write any values other than 0 to move_charge_at_immigrate yet. Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b70cc5fdb445a6929a01e9c406593265b136c99d Author: Li Zefan Date: Wed Mar 10 15:22:12 2010 -0800 cgroups: clean up cgroup_pidlist_find() a bit Don't call get_pid_ns() before we locate/alloc the ns. Signed-off-by: Li Zefan Cc: Serge Hallyn Acked-by: Paul Menage Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67523c48aa74d5637848edeccf285af1c60bf14a Author: Ben Blum Date: Wed Mar 10 15:22:11 2010 -0800 cgroups: blkio subsystem as module Modify the Block I/O cgroup subsystem to be able to be built as a module. As the CFQ disk scheduler optionally depends on blk-cgroup, config options in block/Kconfig, block/Kconfig.iosched, and block/blk-cgroup.h are enhanced to support the new module dependency. Signed-off-by: Ben Blum Cc: Li Zefan Cc: Paul Menage Cc: "David S. Miller" Cc: KAMEZAWA Hiroyuki Cc: Lai Jiangshan Cc: Vivek Goyal Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ca712ea84728531d36841ca8f98f9e8680bcf4e Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:10 2010 -0800 cgroups: fix CONTENTS in cgroups documentation Add a forgotten item into CONTENTS. Signed-off-by: Kirill A. Shutemov Acked-by: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf5d5941fda647fe3d2f2d00cf9e0245236a5f08 Author: Ben Blum Date: Wed Mar 10 15:22:09 2010 -0800 cgroups: subsystem module unloading Provides support for unloading modular subsystems. This patch adds a new function cgroup_unload_subsys which is to be used for removing a loaded subsystem during module deletion. Reference counting of the subsystems' modules is moved from once (at load time) to once per attached hierarchy (in parse_cgroupfs_options and rebind_subsystems) (i.e., 0 or 1). Signed-off-by: Ben Blum Acked-by: Li Zefan Cc: Paul Menage Cc: "David S. Miller" Cc: KAMEZAWA Hiroyuki Cc: Lai Jiangshan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6a1105ba08b265023dd71a4174fb4a29ebc7083 Author: Ben Blum Date: Wed Mar 10 15:22:09 2010 -0800 cgroups: subsystem module loading interface Add interface between cgroups subsystem management and module loading This patch implements rudimentary module-loading support for cgroups - namely, a cgroup_load_subsys (similar to cgroup_init_subsys) for use as a module initcall, and a struct module pointer in struct cgroup_subsys. Several functions that might be wanted by modules have had EXPORT_SYMBOL added to them, but it's unclear exactly which functions want it and which won't. Signed-off-by: Ben Blum Acked-by: Li Zefan Cc: Paul Menage Cc: "David S. Miller" Cc: KAMEZAWA Hiroyuki Cc: Lai Jiangshan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aae8aab40367036931608fdaf9e2dc568b516f19 Author: Ben Blum Date: Wed Mar 10 15:22:07 2010 -0800 cgroups: revamp subsys array This patch series provides the ability for cgroup subsystems to be compiled as modules both within and outside the kernel tree. This is mainly useful for classifiers and subsystems that hook into components that are already modules. cls_cgroup and blkio-cgroup serve as the example use cases for this feature. It provides an interface cgroup_load_subsys() and cgroup_unload_subsys() which modular subsystems can use to register and depart during runtime. The net_cls classifier subsystem serves as the example for a subsystem which can be converted into a module using these changes. Patch #1 sets up the subsys[] array so its contents can be dynamic as modules appear and (eventually) disappear. Iterations over the array are modified to handle when subsystems are absent, and the dynamic section of the array is protected by cgroup_mutex. Patch #2 implements an interface for modules to load subsystems, called cgroup_load_subsys, similar to cgroup_init_subsys, and adds a module pointer in struct cgroup_subsys. Patch #3 adds a mechanism for unloading modular subsystems, which includes a more advanced rework of the rudimentary reference counting introduced in patch 2. Patch #4 modifies the net_cls subsystem, which already had some module declarations, to be configurable as a module, which also serves as a simple proof-of-concept. Part of implementing patches 2 and 4 involved updating css pointers in each css_set when the module appears or leaves. In doing this, it was discovered that css_sets always remain linked to the dummy cgroup, regardless of whether or not any subsystems are actually bound to it (i.e., not mounted on an actual hierarchy). The subsystem loading and unloading code therefore should keep in mind the special cases where the added subsystem is the only one in the dummy cgroup (and therefore all css_sets need to be linked back into it) and where the removed subsys was the only one in the dummy cgroup (and therefore all css_sets should be unlinked from it) - however, as all css_sets always stay attached to the dummy cgroup anyway, these cases are ignored. Any fix that addresses this issue should also make sure these cases are addressed in the subsystem loading and unloading code. This patch: Make subsys[] able to be dynamically populated to support modular subsystems This patch reworks the way the subsys[] array is used so that subsystems can register themselves after boot time, and enables the internals of cgroups to be able to handle when subsystems are not present or may appear/disappear. Signed-off-by: Ben Blum Acked-by: Li Zefan Cc: Paul Menage Cc: "David S. Miller" Cc: KAMEZAWA Hiroyuki Cc: Lai Jiangshan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7b9fff711d5e8db8c844161c684017e556c38a0 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:05 2010 -0800 cgroup: introduce coalesce css_get() and css_put() Current css_get() and css_put() increment/decrement css->refcnt one by one. This patch add a new function __css_get(), which takes "count" as a arg and increment the css->refcnt by "count". And this patch also add a new arg("count") to __css_put() and change the function to decrement the css->refcnt by "count". These coalesce version of __css_get()/__css_put() will be used to improve performance of memcg's moving charge feature later, where instead of calling css_get()/css_put() repeatedly, these new functions will be used. No change is needed for current users of css_get()/css_put(). Signed-off-by: Daisuke Nishimura Acked-by: Paul Menage Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2468c7234b366eeb799ee0648cb58f9cba394a54 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:03 2010 -0800 cgroup: introduce cancel_attach() Add cancel_attach() operation to struct cgroup_subsys. cancel_attach() can be used when can_attach() operation prepares something for the subsys, but we should rollback what can_attach() operation has prepared if attach task fails after we've succeeded in can_attach(). Signed-off-by: Daisuke Nishimura Acked-by: Li Zefan Reviewed-by: Paul Menage Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ce9f07bf1bed9a1f9886373ad0b149294f84c25 Author: Dave Young Date: Wed Mar 10 15:22:02 2010 -0800 Documentation/email-clients.txt: update gmail information Gmail web gui does not work for sending patches now even with firefox "view source with" extension. It will use windows style line breaks to wrap lines automatically when sening email. Rewrite the gmail web gui part of email client documentation. Signed-off-by: Dave Young Cc: Randy Dunlap Cc: Martin Bligh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c98ecaf350737cd424eb94140e9e9f1a3408956 Author: Randy Dunlap Date: Wed Mar 10 15:22:02 2010 -0800 scripts/kernel-doc: fix empty function description section scripts/kernel-doc mishandles a function that has a multi-line function short description and no function parameters. The observed problem was from drivers/scsi/scsi_netlink.c: /** * scsi_netlink_init - Called by SCSI subsystem to intialize * the SCSI transport netlink interface * **/ kernel-doc treated the " * " line as a Description: section with only a newline character in the Description contents. This caused output_highlight() to complain: "output_highlight got called with no args?", plus produce a perl call stack backtrace. The fix is just to ignore Description sections if they only contain "\n". Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6b6e2b112cafcd63bdbebbffe97279f41e5ca62 Author: Bartlomiej Zolnierkiewicz Date: Wed Mar 10 15:22:00 2010 -0800 Documentation: remove obsolete voyager.txt file x86/Voyager support has been removed a year ago. Signed-off-by: Bartlomiej Zolnierkiewicz Inspired-by: Jonathan Corbet Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5247c854ed1cef30e0c7f4c6dfbf3c9d83bcf8e Author: Randy Dunlap Date: Wed Mar 10 15:21:59 2010 -0800 Documentation/SubmitChecklist: add rule #1 Add header file requirements. Compliments of Stephen Rothwell. Stephen calls this Rule #1, so I put it there, but I didn't want to demote any of the others in the list, so I made one of them number 2b. Signed-off-by: Randy Dunlap Cc: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70bace8c1edefa700c7f7af522c5374ef63860ae Author: Randy Dunlap Date: Wed Mar 10 15:21:58 2010 -0800 Documentation/vm/: split txt and source files Documentation/vm/: Expose example and tool source files in the Documentation/ directory in their own files instead of being buried (almost hidden) in readme/txt files. This should help to prevent bitrot. This will make them more visible/usable to users who may need to use them, to developers who may need to test with them, and to anyone who would fix/update them if they were more visible. Also, if any of these possibly should not be in the kernel tree at all, it will be clearer that they are here and we can discuss if they should be removed. Also build the recently-added map_hugetlb.c. Make several functions static to prevent linker warnings. Signed-off-by: Randy Dunlap Acked-by: Eric B Munson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e0051ae48a253685e4309256f9c1ec2bdb74b5d Author: Randy Dunlap Date: Wed Mar 10 15:21:57 2010 -0800 Documentation/fs/: split txt and source files Make dnotify_test.c source file and add it to Makefile so that bitrot can be prevented. Signed-off-by: Randy Dunlap Cc: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d49129accc21ddb2e779d375dacafb612b1bd28d Author: Randy Dunlap Date: Wed Mar 10 15:21:56 2010 -0800 Documentation/laptop/: split txt and source files Documentation/laptops/laptop-mode.txt: Expose example and tool source files in the Documentation/ directory in their own files instead of being buried (almost hidden) in readme/txt files. This should help to prevent bitrot. This will make them more visible/usable to users who may need to use them, to developers who may need to test with them, and to anyone who would fix/update them if they were more visible. Also, if any of these possibly should not be in the kernel tree at all, it will be clearer that they are here and we can discuss if they should be removed. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e61863099f58e458f08c101da87da752a1e009f5 Author: Randy Dunlap Date: Wed Mar 10 15:21:56 2010 -0800 Documentation/timers/: split txt and source files Documentation/timers/hpet.txt: Expose example and tool source files in the Documentation/timers/ directory in their own files instead of being buried (almost hidden) in readme/txt files. This should help to prevent bitrot. This will make them more visible/usable to users who may need to use them, to developers who may need to test with them, and to anyone who would fix/update them if they were more visible. Also, if any of these possibly should not be in the kernel tree at all, it will be clearer that they are here and we can discuss if they should be removed. Signed-off-by: Randy Dunlap Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad25ad979a309963e580015d57e4ec7da72bb7d4 Author: Evgeniy Dushistov Date: Wed Mar 10 15:21:55 2010 -0800 ufs: make solaris fsck happy Alex Viskovatoff let me know that after copying data to solaris's ufs from linux, solaris's fsck sees some errors in cylinder summary information. This is because of solaris expects find some data on another places, then curernt implementation save it. This patch fixes this issue. It is tested by me, and also Alex reported that it works for him. Signed-off-by: Evgeniy Dushistov Reported-by: Alex Viskovatoff Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3a0fd4d877fe7692901b5867ba7cbd3f6d19d22 Author: Alex Viskovatoff Date: Wed Mar 10 15:21:53 2010 -0800 fs/ufs: recognize Solaris-specific file system state Recent releases of Solaris set the fs_clean state of an unmounted UFS file system as FSLOG ("logging fs"). However, the Linux kernel currently does not recognize the value which represents this state. Thus, attempting to mount such a file system rw produces the message kernel: ufs_read_super: can't grok fs_clean 0xfffffffd and the file system is mounted read-only. This patch makes the kernel recognize that value. Signed-off-by: Alex Viskovatoff Cc: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7d4d849b4e3acc405ec222884936800ffb26d48 Author: Andrew Morton Date: Wed Mar 10 15:21:52 2010 -0800 drivers/char/mem.c: cleanups - fix switch statement layout - fix whitespace stuff - fix comment layout - remove unneeded inlining - use __weak - remove trailing whitespace - move uncached_access() inside `#ifndef __HAVE_PHYS_MEM_ACCESS_PROT' - it is otherwise unused. Cc: KAMEZAWA Hiroyuki Cc: OGAWA Hirofumi Cc: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dcefafb6ac90ece8d68a6c203105f3d313e52da4 Author: Wu Fengguang Date: Wed Mar 10 15:21:51 2010 -0800 /dev/mem: dont allow seek to last page So as to return a uniform error -EOVERFLOW instead of a random one: # kmem-seek 0xfffffffffffffff0 seek /dev/kmem: Device or resource busy # kmem-seek 0xfffffffffffffff1 seek /dev/kmem: Block device required Suggested by OGAWA Hirofumi. Cc: OGAWA Hirofumi Reviewed-by: KAMEZAWA Hiroyuki Signed-off-by: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2cb9a75d13676d75bcc6fbc6f885403795581913 Author: Huang Weiyi Date: Wed Mar 10 15:21:51 2010 -0800 fbdev: bfin-lq035q1-fb: remove duplicated #include Remove duplicated #include('s) in drivers/video/bfin-lq035q1-fb.c Signed-off-by: Huang Weiyi Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8b1925430339be1464a9a028754d94984dacfdb Author: Ben Hutchings Date: Wed Mar 10 15:21:49 2010 -0800 video: fix first line of kernel-doc for a few functions The function name must be followed by a space, hypen, space, and a short description. Signed-off-by: Ben Hutchings Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2164235da9153f1fbd5191bf71c86fae322c7dd7 Author: Christoph Egger Date: Wed Mar 10 15:21:49 2010 -0800 obsolete config in kernel source: LWMON5 There was some conditionalizing for the LWMON5 boards in kernel source. However infrastructure for enabling this isn't here so probably the special case code can go as well. Signed-off-by: Christoph Egger Acked-by: Alexander Shishkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c0e0c88422033c9b6162bf7875aecdd095130b7 Author: Joe Perches Date: Wed Mar 10 15:21:48 2010 -0800 drivers/video/via: fix continuation line formats String constants that are continued on subsequent lines with \ will cause spurious whitespace in the resulting output. Signed-off-by: Joe Perches Acked-by: Florian Tobias Schandinat Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8661970875d7d27e4de233d357327fffdb4a5e3d Author: Wang Qiang Date: Wed Mar 10 15:21:47 2010 -0800 NUC900 LCD Controller Driver An LCD controller driver for nuc900s. The Linux LOGO is just fine and the FB-Test application was ok, too. Signed-off-by: Wang Qiang Cc: Wang Zongshun Cc: Russell King Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91d4e0a4c889e3e8078c26542b8f5a322b87adf4 Author: Christoph Egger Date: Wed Mar 10 15:21:46 2010 -0800 fbdev: remove obsolete CONFIG_FB_SOFT_CURSOR The config Option FB_SOFT_BUFFER was removed in c465e05a03209651078b95686158648fd7ed84c5 ("fbcon/fbdev: Move softcursor out of fbdev to fbcon"). While moving to fbcon this single driver has it left as a select in KConfig / #ifdef in source. This last occurence is removed here so the option is really gone Signed-off-by: Christoph Egger Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55a23c4af83df9c8fdf55690a09a3f0a92bd127b Author: Maik Broemme Date: Wed Mar 10 15:21:44 2010 -0800 intelfb: new maintainer It seems that Sylvain no longer maintain the intelfb driver. Two weeks ago I had a short mail conversation with Jean regarding who can replace him. Well I will do it, because I know the driver and use it very often. Attached is a patch which update the maintainer file to make bug reporting easier. Signed-off-by: Maik Broemme Sylvain Meyer Cc: Krzysztof Helt Cc: Dave Airlie Cc: Eric Anholt Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b32bfc3843f7fd090d30853d98866d923cfb8fff Author: Jaya Kumar Date: Wed Mar 10 15:21:43 2010 -0800 broadsheetfb: support storing waveform This patch adds waveform storing capability to broadsheetfb. It uses the firmware class to retrieve the waveform, and the request to initiate the waveform storing is done via a driver sysfs entry, loadstore_waveform. Broadsheet is a framebuffer device. It is slightly different from a typical framebuffer controller that drives a normal TFT-LCD display. Most E-Ink display panels require a waveform in order to function. That is, in order to drive the state of a pixel to black, gray, or white, a specific waveform is utilized. Basically, that waveform represents the specific E-field wiggling needed to get the pixel to its optimal state given current temperature, and its previous state. TN/IPS-LCDs use a similar concept but the driving waveform is sufficiently simple that it is internalized in the TFT source/gate driver. These E-Ink waveforms are specific to a production batch. That is, a batch of display films are produced, then they get characterized and a waveform is generated for that batch. Broadsheet, typically, is attached to its private SPI flash which is then flashed with this waveform. Users won't be able to see the waveform and typically won't ever need to know about it. If however, the display panel attached to broadsheet is changed out, then they will need to update their waveform. That would typically be done at a factory or repair facility rather than by a user. [akpm@linux-foundation.org: fix printk warning] Signed-off-by: Jaya Kumar Cc: Geert Uytterhoeven Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2afb18981739a1426af2a6c952e03c5966b3dfc6 Author: Jaya Kumar Date: Wed Mar 10 15:21:41 2010 -0800 broadsheetfb: add MMIO hooks Allow boards with GP-MMIO controllers to provide hooks to broadsheetfb in order to offload cmd/data writes and data reads instead of relying only on host based GPIO wiggling. Signed-off-by: Jaya Kumar Cc: Geert Uytterhoeven Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e17cea3cece6d3ec47a5b358821505943abe6541 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:41 2010 -0800 viafb: support color depth 15 and 30 Add support for the color depth 15 on IGA1 and 30 on IGA1 and IGA2. To allow the usage of those the driver now refuses color depth that are totally off and otherwise the selection in viafb_check_var is used. Therefore the first call to this for the first framebuffer was delayed a bit. It only enables the new formats if they are requested exactly (viafb_bpp=15|30). As this is a new feature, no regressions are expected. The color depth 15 was successfully tested. Didn't get anything usable for 30 but that might be the programs fault. I would like to get some feedback whether it works as expected or not if somebody knows a program/configuration where it should. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 415559fbf2353f4271a4cd6e11259b8bbc97cc33 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:40 2010 -0800 viafb: rework color setting This is a rewritten version of viafb_setcolreg. The hardware register writes were split up and moved to hw.c where they belong as this is really low level stuff. It was made dual fb aware. Furthermore viafb_setcmap was removed as the problem with 8bpp originated from a bug in writing multiple color registers at once. The removal of viafb_setcmap might introduce a small performance regression but its certainly better to receive the correct result a bit slower than a garbled picture fast. It should give us a working 8bpp mode and is more extensible than the old hardcoded code. No other regressions are expected but as the hardware might be a bit picky it might cause some regressions in 8bpp mode on some hardware although I doubt that. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbb7884be758ca9ac5ec84cbe7eb21f21bce9d8f Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:39 2010 -0800 viafb: some virtual_xres handling fixes Do not require the virtual_xres to be aligned as line length is for such purposes. Calculate always the smallest line length required. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd140691bda491b417a6d1e81b03416b54cb8d8d Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:38 2010 -0800 viafb: rework color checking Make color checking a bit more tolerant in what values it allows and more fine grained to later support 15 and 30 bits formats. It splits the filling of the color information in var to a seperate function and sets some color related values in var that where previously untouched. This could be a bug fix but at least I don't know any applications that was fooled by not correctly setting the fields in var. At least no regressions are expected. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dba77f8409eb861b28d295211776d953a8255ec7 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:37 2010 -0800 viafb: make some variables a bit less global Move some variables closer to their usage. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4bbac05f8c0ab40dcc52ed6dff44e1b0d80fa6e3 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:36 2010 -0800 viafb: remove dead code due to IGA1_IGA2 Some code depended on IGA1_IGA2 which was never set (at least with the symbolic name). Remove this dead code although it might one day be useful to get a hint on how some things might work. However as this is dead it is likely full of bugs and would prevent a clean structure (as it has some very strange things). Dead code -> no regressions, at least if VIA doesn't do anything very ugly. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit daacccd1657bdecae8f7c98a8e2b84367a8d4e87 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:35 2010 -0800 viafb: split color mode setting up This patch splits color mode setting up in seperate functions. Some hardware initialization that was previously mixed with it is moved to viafb_setmode. As are the calls to the newly created function. This is yet another little step towards controlling each IGA on its own. As this patch really aims too mimic the old behaviour no regressions are expected. However I noticed that 8bpp (or 6bpp?) seems actually a bit broken before and after the patch. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe9aab8ec2d65378b0663c3287a67da4a892b54e Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:34 2010 -0800 viafb: introduce strict parameter checking Refuse to work if wrong parameters are given. This should improve the user experience as it will be clear that something is wrong and not silently ignored. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c9443ed284fc6ec8a4f702c66e9ad6bdf912c05 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:34 2010 -0800 viafb: make viafb_set_par more dual framebuffer compatible This patch is an attempt to make viafb_set_par work correctly with more than one framebuffer. As modesetting is not (yet/easily) possible for each individual IGA it uses the (normally to be avoided) global variables viafbinfo{,1} to ensure that each function is called with the correct values. This patch (finally) allows usable dual framebuffer setups and should not affect non dual fb ones. It works in some (most?) configurations as sometimes the driver still gets device connections wrong. It can be worth to try the devices in reverse order (in viafb_active_dev). The user experience is still not very nice as: - on the second fb you'll normally have a garbled picture as long as no application draws to it goal: auto on/off devices depending on reference counting - as the whole machinery is always done you can see mode changes also in an unaffected framebuffer goal: split modesetting up for each individual IGA Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee79d54db45bb5e6da3eb76bae162c920aeb9763 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:32 2010 -0800 viafb: video address setting revisited Set always the correct video address. Especially do panning right on multiple IGAs. This should have no effect on single monitor mode (no SAMM, no dual fb). For SAMM without dual fb this might break something as I really cannot image what we are supposed to do for different resolutions with a single framebuffer as we can't get data out of nowhere (no, they are not set up in something one would call "expanded"). Previously I got for that funny colored pictures as the second IGA pointed to video memory that was never written to. After the patch it'll work as cloning if the first and second mode are identical (this was working already without SAMM). Finally for dual fb this should push us a step in the right direction. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7cf607923dee1898b9fc1e62568b79e7f785b995 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:31 2010 -0800 viafb: reorder initialization for dual framebuffer mode This patch reorders the initialization for dual framebuffer mode to not ignore the settings for the first mode. Previously they were overwritten with the settings for the second one before they were applied. This should have no effect on non dual framebuffer mode and do what the user intended (initalization to desired modes) in dual framebuffer mode. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8566b29e86ef3906dd6c0ea4a02c2a925748da5 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:30 2010 -0800 viafb: yet another dead code removal Remove some functions that were never executed and a related undocumented module parameter. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5f06f5cddd6681b978ffdb53755e28eefccb1bb Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:30 2010 -0800 viafb: some dvi cleanup Remove some unused variables, move some dvi code around and store the detected maximum resolution for later use. The vertical resolution is handled as the old code did it but I hope it can be read from the hardware some day. No runtime change expected. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b24b00c364bb3bfa717ba2ead258a527b20cc5f Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:29 2010 -0800 viafb: remove the remaining VIA_RES_* uses Remove the rest of the VIA_RES_* use cases. Obviously this was no longer useful. Keep the related infrastructure/functions for later use. No runtime impact expected. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd73d6868b9ecb4841def0c6ff0a25da27db33ba Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:28 2010 -0800 viafb: split global index up This is the first step to remove an artificial global index that was used in two ways: 1. As a pseudo index in the mode table. Pseudo as you had to search through the table to find the referenced entry. This was replaced by using a pointer to the entry. 2. As a shortcut to compare a combination of horizontal and vertical resolution at the same time. This was replaced by a "(hres<<16) | vres" which is good enough for now and the near future. If vres or hres become greater than 2^16 this might indeed cause problems but this solution allows to split this indexing mess up without the requirement to do even more code changes. This is a big change that will allow more clean ups. It should be a bit faster but that is probably not relevant for normal operation. No regressions expected but as this is a relatively big step heavy testing is appreciated. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2365dfe99495159b3395dd0eddece2f0d58f527a Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:27 2010 -0800 viafb: remove dead code Remove a completly unused function. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc8b82f8c80e8b9e212e0102ee7af9972829e45c Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:26 2010 -0800 viafb: deprecate private ioctls Print a warning when viafb ioctls are called. Those should not be used as their exact meaning is sometimes unknown and they in parts duplicate functionality present in the framebuffer interface. There is no known user of these ioctls. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1c341a060da1bd66a1982198b1a99765b07b8a2 Author: Jaya Kumar Date: Wed Mar 10 15:21:24 2010 -0800 broadsheetfb: add multiple panel type support Update broadsheetfb to add support for multiple panel types. The 3.7" and 6" are known to work but the 9.7" is untested due to lack of hardware. Signed-off-by: Jaya Kumar Cc: Geert Uytterhoeven Cc: Krzysztof Helt Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d40f29bff30a1a50d7ad69bd150c9cda1ce1ba9d Author: Michael Hennerich Date: Wed Mar 10 15:21:24 2010 -0800 fbdev: bf54x-lq043fb/bfin-t350mcqb-fb: drop custom mmap() handler The common Blackfin code implements the get_fb_unmapped_area() function, so we no longer need to have our own mmap() handler. The common fb code will take care of everything for us now. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d3580d40cc38bbaf63d0b2756931e0ae241a9ea Author: Roel Kluin Date: Wed Mar 10 15:21:23 2010 -0800 asiliantfb: fix test of unsigned in asiliant_calc_dclk2() Ftarget, Fret, n and m are unsigned so the tests did not work. Signed-off-by: Roel Kluin Cc: Andres Salomon Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e3e37a5a7c91045497553bcbd6a5faea98b21b3 Author: André Goddard Rosa Date: Wed Mar 10 15:21:22 2010 -0800 coredump: plug a memory leak situation on dump_seek() After having started writing the coredump, if filesystem reports an error anytime while writing part of the core file, we would leak a memory page when bailing out. Signed-off-by: André Goddard Rosa Acked-by: KOSAKI Motohiro Cc: Alexander Viro Cc: Roland McGrath Cc: WANG Cong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5cacdb4add1b1e50fe75edc50ebbb7bddd9cf5e7 Author: Christoph Hellwig Date: Wed Mar 10 15:21:21 2010 -0800 Add generic sys_olduname() Add generic implementations of the old and really old uname system calls. Note that sh only implements sys_olduname but not sys_oldolduname, but I'm not going to bother with another ifdef for that special case. m32r implemented an old uname but never wired it up, so kill it, too. Signed-off-by: Christoph Hellwig Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Jeff Dike Cc: Hirokazu Takata Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin Cc: Al Viro Cc: Arnd Bergmann Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: "Luck, Tony" Cc: James Morris Cc: Andreas Schwab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e28cbf22933d0c0ccaf3c4c27a1a263b41f73859 Author: Christoph Hellwig Date: Wed Mar 10 15:21:19 2010 -0800 improve sys_newuname() for compat architectures On an architecture that supports 32-bit compat we need to override the reported machine in uname with the 32-bit value. Instead of doing this separately in every architecture introduce a COMPAT_UTS_MACHINE define in and apply it directly in sys_newuname(). Signed-off-by: Christoph Hellwig Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Jeff Dike Cc: Hirokazu Takata Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin Cc: Al Viro Cc: Arnd Bergmann Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: "Luck, Tony" Cc: James Morris Cc: Andreas Schwab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit baed7fc9b580bd3fb8252ff1d9b36eaf1f86b670 Author: Christoph Hellwig Date: Wed Mar 10 15:21:18 2010 -0800 Add generic sys_ipc wrapper Add a generic implementation of the ipc demultiplexer syscall. Except for s390 and sparc64 all implementations of the sys_ipc are nearly identical. There are slight differences in the types of the parameters, where mips and powerpc as the only 64-bit architectures with sys_ipc use unsigned long for the "third" argument as it gets casted to a pointer later, while it traditionally is an "int" like most other paramters. frv goes even further and uses unsigned long for all parameters execept for "ptr" which is a pointer type everywhere. The change from int to unsigned long for "third" and back to "int" for the others on frv should be fine due to the in-register calling conventions for syscalls (we already had a similar issue with the generic sys_ptrace), but I'd prefer to have the arch maintainers looks over this in details. Except for that h8300, m68k and m68knommu lack an impplementation of the semtimedop sub call which this patch adds, and various architectures have gets used - at least on i386 it seems superflous as the compat code on x86-64 and ia64 doesn't even bother to implement it. [akpm@linux-foundation.org: add sys_ipc to sys_ni.c] Signed-off-by: Christoph Hellwig Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Jeff Dike Cc: Hirokazu Takata Cc: Thomas Gleixner Cc: Ingo Molnar Reviewed-by: H. Peter Anvin Cc: Al Viro Cc: Arnd Bergmann Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: "Luck, Tony" Cc: James Morris Cc: Andreas Schwab Acked-by: Jesper Nilsson Acked-by: Russell King Acked-by: David Howells Acked-by: Kyle McMartin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4679373cf4ee0e7792dc56205365732b725c2c1 Author: Christoph Hellwig Date: Wed Mar 10 15:21:15 2010 -0800 Add generic sys_old_mmap() Add a generic implementation of the old mmap() syscall, which expects its argument in a memory block and switch all architectures over to use it. Signed-off-by: Christoph Hellwig Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Jeff Dike Cc: Hirokazu Takata Cc: Thomas Gleixner Cc: Ingo Molnar Reviewed-by: H. Peter Anvin Cc: Al Viro Cc: Arnd Bergmann Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: "Luck, Tony" Cc: James Morris Cc: Andreas Schwab Acked-by: Jesper Nilsson Acked-by: Russell King Acked-by: Greg Ungerer Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d0e52830e9ae09b872567f4aca3dfb5b5918079 Author: Christoph Hellwig Date: Wed Mar 10 15:21:13 2010 -0800 Add generic sys_old_select() Add a generic implementation of the old select() syscall, which expects its argument in a memory block and switch all architectures over to use it. Signed-off-by: Christoph Hellwig Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Jeff Dike Cc: Hirokazu Takata Cc: Thomas Gleixner Cc: Ingo Molnar Reviewed-by: H. Peter Anvin Cc: Al Viro Cc: Arnd Bergmann Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: "Luck, Tony" Cc: James Morris Acked-by: Andreas Schwab Acked-by: Russell King Acked-by: Greg Ungerer Acked-by: David Howells Cc: Andreas Schwab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 724ee626f38feaea215a11790e1a0cb5d83b0628 Author: Joe Perches Date: Wed Mar 10 15:21:11 2010 -0800 drivers/block/floppy.c: remove unnecessary casting in fd_ioctl Convert outparam to const void *. Cast outparam to const char * for strlen(). Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0aad92cfea6fec14bd57dd9c283cc6eb023c97bd Author: Joe Perches Date: Wed Mar 10 15:21:10 2010 -0800 drivers/block/floppy.c: remove misleading, used once FD_IOCTL_ALLOWED macro Just code the test directly Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 712e1de43ed572886d6913a86eee5e73b7de4318 Author: Joe Perches Date: Wed Mar 10 15:21:10 2010 -0800 drivers/block/floppy.c: remove obfuscating CODE2SIZE macro Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ded2863d09208b27baa4a6ad95bb7e5539e48c05 Author: Joe Perches Date: Wed Mar 10 15:21:09 2010 -0800 drivers/block/floppy.c: add __func__ to debugt Make debugt messages a little neater. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f2527174ab1ee7f4550c91be47b3f843ff1316d Author: Joe Perches Date: Wed Mar 10 15:21:08 2010 -0800 drivers/block/floppy.c: convert raw_cmd_copyin from while(1) to label: goto Reduces indent. Makes a bit more readable and intelligible. Return value now at bottom of function. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce2f11fe784f7999b82c7a71cdbcb86ad2653def Author: Joe Perches Date: Wed Mar 10 15:21:08 2010 -0800 drivers/block/floppy.c: remove some unnecessary casting Remove char/void __user * use. Remove kmalloc cast. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ebddd85a6a6ad793eca82d65fba4573d0e28042 Author: Joe Perches Date: Wed Mar 10 15:21:07 2010 -0800 drivers/block/floppy.c: use %pf in logging messages Print the function name not the pointer address where useful and possible Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 275176bc2a7bbd5c4446ba12b8f4353a69012053 Author: Joe Perches Date: Wed Mar 10 15:21:06 2010 -0800 drivers/block/floppy.c: use __func__ where appropriate Add and use __func__ to is_alive. Use __func__ in some DPRINTs. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 891eda80a5227a12956d7997baf9f4b54a9aa4f9 Author: Joe Perches Date: Wed Mar 10 15:21:05 2010 -0800 drivers/block/floppy.c: DPRINT neatening Move DPRINT macro definition above 1st use Consolidate a format string (>80 columns) Add a newline to an unterminated message Comment neatened Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a23d133359eec2297ff4c72c260ccacb156d883 Author: Joe Perches Date: Wed Mar 10 15:21:04 2010 -0800 drivers/block/floppy.c: remove #define FLOPPY_SANITY_CHECK The code could not be compiled without the #define, so just remove it and the #ifdef/#endif lines. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73507e6cd8dc6cd98a39164a9b775c7092faddb4 Author: Joe Perches Date: Wed Mar 10 15:21:03 2010 -0800 drivers/block/floppy.c: remove unnecessary argument from [__]reschedule_timeout Prior to patch "drivers/block/floppy.c: Use pr_" only reschedule_timeout(,"request done"...) printed a numeric value after a reschedule_timeout event message. Restore that behavior and remove the now unnecessary argument. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0da3132f90c01f532dd85c537b5c78a196a11e24 Author: Joe Perches Date: Wed Mar 10 15:21:03 2010 -0800 drivers/block/floppy.c: unclutter redo_fd_request logic Change for(;;) with continue; to label: goto label Reduces indentation and adds a bit of clarity. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 416d8d2888db392c562fb8afaf9136730ef0da9e Author: Joe Perches Date: Wed Mar 10 15:21:02 2010 -0800 drivers/block/floppy.c: remove REPEAT macro Macros with hidden flow changes aren't nice. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15b2630c587dcea931f563deb50d617af96b4edb Author: Joe Perches Date: Wed Mar 10 15:21:01 2010 -0800 drivers/block/floppy.c: remove unnecessary return and braces Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57584c5a3824a15f65d2b065d9f453fc1ae1dab7 Author: Joe Perches Date: Wed Mar 10 15:21:00 2010 -0800 drivers/block/floppy.c: add function is_ready_state Used a couple of times, might simplify the code a bit. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29f1c7848feb3954939b52fd5b7dca30dbce9426 Author: Joe Perches Date: Wed Mar 10 15:21:00 2010 -0800 drivers/block/floppy.c: convert int initialising to bool initialized Don't initialize initialized either. Default is false. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d18ef09dfe4d1272446ad55ce5d7b06ff4b9ca8 Author: Joe Perches Date: Wed Mar 10 15:20:59 2010 -0800 drivers/block/floppy.c: remove #define DEVICE_NAME "floppy" Use it directly in the one place it's used. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c529730a98874fa951995d8a312c7fd606832eda Author: Joe Perches Date: Wed Mar 10 15:20:58 2010 -0800 drivers/block/floppy.c: move leading && and || to preceding line Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74f63f469ed1cee8305840b7bbcee2f99797cd12 Author: Joe Perches Date: Wed Mar 10 15:20:58 2010 -0800 drivers/block/floppy.c: convert int 1/0 to bool true/false Various functions use int where bool is appropriate lock_fdc, wait_til_done, poll_drive, user_reset_fdc Convert to bool. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55eee80c6233c67217a6238dd94f1fc765c723d1 Author: Joe Perches Date: Wed Mar 10 15:20:57 2010 -0800 drivers/block/floppy.c: remove macros CALL, WAIT and IWAIT Obfuscating macros with embedded returns are not nice Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86b12b48a29f4795e2e550f510d39931576bdf75 Author: Joe Perches Date: Wed Mar 10 15:20:56 2010 -0800 drivers/block/floppy.c: remove [_]COPYIN [_]COPYOUT and ECALL macros Remove these obfuscating macros with hidden returns Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4575b55281825d157573bbc5aa28b9144193ddd2 Author: Joe Perches Date: Wed Mar 10 15:20:55 2010 -0800 drivers/block/floppy.c: remove most uses of CALL and ECALL macros Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e029853612ba5999caed4dbc833dab729aac75ba Author: Joe Perches Date: Wed Mar 10 15:20:55 2010 -0800 drivers/block/floppy.c: remove [U]CLEARF, [U]SETF, and [U]TESTF macros Use clear_bit, set_bit, and test_bit functions directly Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87f530d8f1733651f3e34b81c801d6e1bb635936 Author: Joe Perches Date: Wed Mar 10 15:20:54 2010 -0800 drivers/block/floppy.c: add debug_dcl(...) macro Converted #ifdef DCL_DEBUG if (test) DPRINTK(...); #endif to debug_dcl(test, ...); Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52a0d61f64123ab758d8b8cc8f8ca521733d2f32 Author: Joe Perches Date: Wed Mar 10 15:20:53 2010 -0800 drivers/block/floppy.c: remove macro LOCK_FDC Macros with hidden returns aren't nice. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0a52d67de6da21db0e549e38749b7a00029fea3 Author: Joe Perches Date: Wed Mar 10 15:20:52 2010 -0800 drivers/block/floppy.c: remove a few spaces from function casts Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da27365342868df88fdd5c217bf68ec10b14b5f0 Author: Joe Perches Date: Wed Mar 10 15:20:52 2010 -0800 drivers/block/floppy.c: remove IN/OUT macros, indent switch/case Remove ugly IN/OUT macros, use direct case and code Add missing semicolon after ECALL Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96534f1dd5bf9d324c2d31355cb69565381d1460 Author: Joe Perches Date: Wed Mar 10 15:20:51 2010 -0800 drivers/block/floppy.c: indent a comment Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b87c9e0a880f2992dc210eb4ea8b2da6c63883ca Author: Joe Perches Date: Wed Mar 10 15:20:50 2010 -0800 drivers/block/floppy.c: remove CLEARSTRUCT macro, use memset Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb57f0c662faa9879e8f265c9bc1f15bb238d2c7 Author: Joe Perches Date: Wed Mar 10 15:20:50 2010 -0800 drivers/block/floppy.c: comment neatening and remove naked ; Spacing, column alignment and a for loop with a naked semicolon converted to an assign and while Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2300f90e31178f44b0e903c12ea311df1297d7fa Author: Joe Perches Date: Wed Mar 10 15:20:49 2010 -0800 drivers/block/floppy.c: remove LAST_OUT macro Macros with hidden returns are not nice. Convert the 2 uses to use direct code. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7b2b2ecd88d06ae212d069a4e187ab690b1636f Author: Joe Perches Date: Wed Mar 10 15:20:48 2010 -0800 drivers/block/floppy.c: hoist assigns from if()s, neatening Move assigns above if()s Remove unnecessary parentheses from returns Use a temporary for a duplicated test Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 045f98363080ddbbcef6b8b8306ec58a818406a0 Author: Joe Perches Date: Wed Mar 10 15:20:47 2010 -0800 drivers/block/floppy.c: remove used once CHECK_READY macro Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a81ee5447157a4b9930bab8ec70cf77a55db64e8 Author: Joe Perches Date: Wed Mar 10 15:20:46 2010 -0800 drivers/block/floppy.c: remove unnecessary braces Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b46df356de8c63882cfb1ee7501bd9c772a6981b Author: Joe Perches Date: Wed Mar 10 15:20:46 2010 -0800 drivers/block/floppy.c: use pr_ Convert bare printk to pr_info and pr_cont Convert printk(KERN_ERR to pr_err Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48c8cee61f22fe5a2ea00488222b3415378469ad Author: Joe Perches Date: Wed Mar 10 15:20:45 2010 -0800 drivers/block/floppy.c: #define space and column neatening Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d49375434ec011dabcc8bfa5091f5327284e42ce Author: Joe Perches Date: Wed Mar 10 15:20:44 2010 -0800 drivers/block/floppy.c: convert some #include Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 718a38211bf4375c0a1efad3afbc5dbaef5d33f9 Author: Wu Fengguang Date: Wed Mar 10 15:20:43 2010 -0800 mm: introduce dump_page() and print symbolic flag names - introduce dump_page() to print the page info for debugging some error condition. - convert three mm users: bad_page(), print_bad_pte() and memory offline failure. - print an extra field: the symbolic names of page->flags Example dump_page() output: [ 157.521694] page:ffffea0000a7cba8 count:2 mapcount:1 mapping:ffff88001c901791 index:0x147 [ 157.525570] page flags: 0x100000000100068(uptodate|lru|active|swapbacked) Signed-off-by: Wu Fengguang Cc: Ingo Molnar Cc: Alex Chiang Cc: Rik van Riel Cc: Andi Kleen Cc: Mel Gorman Cc: Christoph Lameter Cc: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b3a6549b2602ca30f58715a0071e29f9898cae9 Author: Julia Lawall Date: Wed Mar 10 15:20:42 2010 -0800 drivers/scsi/ses.c: eliminate double free The few lines below the kfree of hdr_buf may go to the label err_free which will also free hdr_buf. The most straightforward solution seems to be to just move the kfree of hdr_buf after these gotos. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r@ identifier E; expression E1; iterator I; statement S; @@ *kfree(E); ... when != E = E1 when != I(E,...) S when != &E *kfree(E); // Signed-off-by: Julia Lawall Cc: James Bottomley Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d30a1f6315b8940537e8e98882c6038fbac9ba5 Author: Thomas Gleixner Date: Wed Mar 10 15:20:40 2010 -0800 mm: do not iterate over NR_CPUS in __zone_pcp_update() __zone_pcp_update() iterates over NR_CPUS instead of limiting the access to the possible cpus. This might result in access to uninitialized areas as the per cpu allocator only populates the per cpu memory for possible cpus. This problem was created as a result of the dynamic allocation of pagesets from percpu memory that went in during the merge window - commit 99dcc3e5a94ed491fbef402831d8c0bbb267f995 ("this_cpu: Page allocator conversion"). Signed-off-by: Thomas Gleixner Acked-by: Pekka Enberg Acked-by: Tejun Heo Acked-by: Christoph Lameter Acked-by: Mel Gorman Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53bddb4e9f3f53df02a783751984ddeade71b085 Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:20:38 2010 -0800 nommu: fix build breakage Commit 34e55232e59f7b19050267a05ff1226e5cd122a5 ("mm: avoid false sharing of mm_counter") added sync_mm_rss() for syncing loosely accounted rss counters. It's for CONFIG_MMU but sync_mm_rss is called even in NOMMU enviroment (kerne/exit.c, fs/exec.c). Above commit doesn't handle it well. This patch changes SPLIT_RSS_COUNTING depends on SPLIT_PTLOCKS && CONFIG_MMU And for avoid unnecessary function calls, sync_mm_rss changed to be inlined noop function in header file. Reported-by: David Howells Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Mike Frysinger Signed-off-by: Michal Simek Signed-off-by: David Howells Cc: Greg Ungerer Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 936ed49a540e2dce645da27e7e4032b24310a8e4 Author: Mike Frysinger Date: Wed Mar 10 15:20:38 2010 -0800 MAINTAINERS: add bfin_sdh driver Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 516a82422209e078345d0ca54b16793d7bfd4782 Author: Albert Herranz Date: Wed Mar 10 15:20:37 2010 -0800 sdio: recognize io card without powercycle SDIO Simplified Specification V2.00 states that it is strongly recommended that the host executes either a power reset or issues a CMD52 (I/O Reset) to re-initialize an I/O only card or the I/O portion of a combo card. Additionally, the CMD52 must be issued first because it cannot be issued after a CMD0. With this patch the Nintendo Wii SDIO-based WLAN card is detected after a system reset, without requiring a complete system powercycle. Signed-off-by: Albert Herranz Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0ab4a4d5094e5d17b103dc5073529a04f00a469 Author: Uwe Kleine-König Date: Wed Mar 10 15:20:35 2010 -0800 rtc/hctosys: only claim the RTC provided the system time if it did Without this patch /sys/class/rtc/$CONFIG_RTC_HCTOSYS_DEVICE/hctosys contains a 1 (meaning "This rtc was used to initialize the system clock") even if reading the time at bootup failed. Moreover change error handling in rtc_hctosys() to use goto and so reduce the indention level. Signed-off-by: Uwe Kleine-König Cc: Paul Gortmaker Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 019b4d123aa7b9fc135b532e021cfde85db7665d Author: Richard Kennedy Date: Wed Mar 10 15:20:33 2010 -0800 fs: buffer_head: remove kmem_cache constructor to reduce memory usage under slub When using slub, having a kmem_cache constructor forces slub to add a free pointer to the size of the cached object, which can have a significant impact to the number of small objects that can fit into a slab. As buffer_head is relatively small and we can have large numbers of them, removing the constructor is a definite win. On x86_64 removing the constructor gives me 39 objects/slab, 3 more than without the patch. And on x86_32 73 objects/slab, which is 9 more. As alloc_buffer_head() already initializes each new object there is very little difference in actual code run. Signed-off-by: Richard Kennedy Cc: Alexander Viro Cc: Jens Axboe Acked-by: Nick Piggin Cc: "Theodore Ts'o" Reviewed-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03affdef4fc85e416e3862abb0aa549c6034cdd0 Author: Joe Perches Date: Wed Mar 10 15:20:32 2010 -0800 fs/ocfs2/cluster/tcp.c: remove use of NIPQUAD, use %pI4 Signed-off-by: Joe Perches Cc: Mark Fasheh Acked-by: Joel Becker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0636b33c5f2fac4e274464ae6867805f080fc433 Merge: 69960a2 a48f509 070e140 a72042c Author: Roland Dreier Date: Fri Mar 12 10:54:20 2010 -0800 Merge branches 'cxgb3', 'ipoib', 'misc' and 'nes' into for-next commit a72042c08a8ba3b685dc9cba62c57c48188ef2c8 Author: Chien Tung Date: Wed Mar 3 19:13:26 2010 +0000 RDMA/nes: Fix CX4 link problem in back-to-back configuration Commit 09124e19 ("RDMA/nes: Add support for KR device id 0x0110") took out too much code and broke CX4 link detection in back-to-back configuration. Put back the code that does the link check. Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit 8447b360a3897bdfb0677107564d1dd9ab6e63be Author: Jack Steiner Date: Thu Mar 11 12:43:29 2010 -0600 x86, UV: Fix target_cpus() in x2apic_uv_x.c target_cpu() should initially target all cpus, not just cpu 0. Otherwise systems with lots of disks can exhaust the interrupt vectors on cpu 0 if a large number of disks are discovered before the irq balancer is running. Note: UV code only... Signed-off-by: Jack Steiner LKML-Reference: <20100311184328.GA21433@sgi.com> Signed-off-by: Ingo Molnar commit 8d002bdc9f1f9a1220c0d87a7321f0233ace97cd Author: Geert Uytterhoeven Date: Tue Dec 15 21:49:57 2009 +0100 mfd: Several MFD drivers should depend on GENERIC_HARDIRQS commit 5fb4d38b19d95a5f980f0a10adba798f5b92128c ("mfd: Move WM831x to generic IRQ") didn't take into account that genirq support depends on GENERIC_HARDIRQS. Additionally, 2.6.34-rc1 added: - commit 2afa62ea76027b00e472ddb672191e6e15425b43 ("mfd: Use genirq in 88pm860x"). - commit 760e4518788df6762700e6bb9dd8692379f11168 ("mfd: Convert WM8350 to genirq"). - commit 1f1cf8f98cf6588365efeaab8e7e7758aaa77f6e ("mfd: Update irq handler in max8925") Make all of them depend on GENERIC_HARDIRQS to avoid compile errors on architectures that don't support genirq yet. Signed-off-by: Geert Uytterhoeven Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit a5300dcbbd5d455a1a5978095b8f78af66c540a6 Author: Samuel Ortiz Date: Mon Mar 8 20:07:48 2010 +0100 mfd: Fix sm501 requested region size We should only request for the MFD used region, not the whole thing. Signed-off-by: Samuel Ortiz Tested-by: Paul Mundt Reviewed-by: H Hartley Sweeten commit 964ad81cbd933e5fa310faeec1e923c14651284b Author: David S. Miller Date: Fri Mar 12 00:00:17 2010 -0800 ipconfig: Handle devices which take some time to come up. Some network devices, particularly USB ones, take several seconds to fully init and appear in the device list. If the user turned ipconfig on, they are using it for NFS root or some other early booting purpose. So it makes no sense to just flat out fail immediately if the device isn't found. It also doesn't make sense to just jack up the initial wait to something crazy like 10 seconds. Instead, poll immediately, and then periodically once a second, waiting for a usable device to appear. Fail after 12 seconds. Signed-off-by: David S. Miller Tested-by: Christian Pellegrin commit 9f29006ae8c85746e5a52d557f689359149a0793 Author: Chien Tung Date: Wed Mar 3 19:13:28 2010 +0000 RDMA/nes: Clear stall bit before destroying NIC QP Clear the stall bit to drop any incoming packets while destroying NIC QP. This will prevent a chip resource leak. Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit 883c699241f48667ff59277d8c20790868fd4829 Author: Faisal Latif Date: Tue Mar 2 17:22:51 2010 -0600 RDMA/nes: Set assume_aligned_header bit Set assume_aligned_header bit in QP context as requested by hardware group. Signed-off-by: Faisal Latif Signed-off-by: Roland Dreier commit 69960a275efc9d82797bbbe2460a2d6c9cace314 Author: Steve Wise Date: Wed Mar 3 15:06:34 2010 +0000 RDMA/cxgb3: Wait at least one schedule cycle during device removal During a hot-plug LLD removal event or an EEH error event, iw_cxgb3 must ensure that any/all threads that might be in a cxgb3 exported function must return from the function before iw_cxgb3 returns from its event processing. Do this by calling synchronize_net(). Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 070e140c4c536df33a9870318791b2ca8f7dbfcf Author: Steve Wise Date: Thu Mar 4 18:18:18 2010 +0000 IB/mad: Ignore iWARP devices on device removal When an iWARP device is unloaded, the ib_mad module logs errors. It should be ignoring iWARP devices on device removal just like it does on device add. Signed-off-by: Steve Wise Acked-by: Sean Hefty Signed-off-by: Roland Dreier commit a48f509b26cec53338f4b0abd52ecea35e3974b8 Author: Or Gerlitz Date: Thu Mar 4 13:17:37 2010 +0000 IPoIB: Include return code in trace message for ib_post_send() failures Print the return code of ib_post_send() if it fails to make these debugging messages more useful. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit f0dc117abdfa9a0e96c3d013d836460ef3cd08c7 Author: Eli Cohen Date: Wed Mar 3 12:27:52 2010 +0000 IPoIB: Fix TX queue lockup with mixed UD/CM traffic The IPoIB UD QP reports send completions to priv->send_cq, which is usually left unarmed; it only gets armed when the number of outstanding send requests reaches the size of the TX queue. This arming is done only in the send path for the UD QP. However, when sending CM packets, the net queue may be stopped for the same reasons but no measures are taken to recover the UD path from a lockup. Consider this scenario: a host sends high rate of both CM and UD packets, with a TX queue length of N. If at some time the number of outstanding UD packets is more than N/2 and the overall outstanding packets is N-1, and CM sends a packet (making the number of outstanding sends equal N), the TX queue will be stopped. When all the CM packets complete, the number of outstanding packets will still be higher than N/2 so the TX queue will not be restarted. Fix this by calling ib_req_notify_cq() when the queue is stopped in the CM path. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit 720e7749279bde0d08684b1bb4e7a2eedeec6394 Author: Sachin Prabhu Date: Thu Mar 11 12:24:45 2010 -0500 GFS2: Skip check for mandatory locks when unlocking gfs2_lock() will skip locks on file which have mode set to 02666. This is a problem in cases where the mode of the file is changed after a process has obtained a lock on the file. Such a lock will be skipped and will result in a BUG in locks_remove_flock(). gfs2_lock() should skip the check for mandatory locks when unlocking a file. Signed-off-by: Sachin Prabhu Signed-off-by: Steven Whitehouse commit 3d07467b7aa91623b31d7b5888a123a2c8c8e9cc Author: Peter Zijlstra Date: Wed Mar 10 17:07:24 2010 +0100 sched: Fix pick_next_highest_task_rt() for cgroups Since pick_next_highest_task_rt() already iterates all the cgroups and is really only interested in tasks, skip over the !task entries. Reported-by: Dhaval Giani Signed-off-by: Peter Zijlstra Tested-by: Dhaval Giani LKML-Reference: Signed-off-by: Ingo Molnar commit d6dd692168c049196f54edc2e8227c60702bb1d2 Author: Mike Travis Date: Fri Mar 5 13:10:38 2010 -0600 x86: Reduce per cpu warning boot up messages Reduce warning message output to one line only instead of per cpu. Signed-of-by: Mike Travis Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Brian Gerst Cc: x86@kernel.org Signed-off-by: Ingo Molnar commit 10fb7f1f2d311b4d2e5d881fe2d83f1c281100f9 Author: Mike Travis Date: Fri Mar 5 13:10:36 2010 -0600 x86: Reduce per cpu MCA boot up messages Don't write per cpu MCA boot up messages. Signed-of-by: Mike Travis Cc: Hidetoshi Seto Cc: x86@kernel.org Signed-off-by: Ingo Molnar commit ab3b3aa5dd01b3aaa6b15caee113b21b1b6520c4 Author: Dan Carpenter Date: Sat Mar 6 14:17:52 2010 +0300 sched: Cleanup: remove unused variable in try_to_wake_up() We haven't used the "orig_rq" variable since 055a00865d "Fix/add missing update_rq_clock() calls" Signed-off-by: Dan Carpenter Cc: Peter Zijlstra Cc: Andreas Herrmann Cc: Gautham R Shenoy Cc: efault@gmx.de LKML-Reference: <20100306111752.GL4958@bicker> Signed-off-by: Ingo Molnar commit 915a0b575fdb2376135ed9334b3ccb1eb51db622 Merge: e02c4fd 0e95017 Author: Ingo Molnar Date: Thu Mar 11 13:39:33 2010 +0100 Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent commit f56e8a0765cc4374e02f4e3a79e2427b5096b075 Author: Paul E. McKenney Date: Fri Mar 5 15:03:27 2010 -0800 x86/mce: Fix RCU lockdep splats Create an rcu_dereference_check_mce() that checks for RCU-sched read side and mce_read_mutex being held on update side. Replace uses of rcu_dereference() in arch/x86/kernel/cpu/mcheck/mce.c with this new macro. Signed-off-by: Paul E. McKenney Cc: "H. Peter Anvin" Cc: x86@kernel.org Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267830207-9474-3-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 007b09243b099811124f69d492adeebe9e439f96 Author: Paul E. McKenney Date: Fri Mar 5 15:03:26 2010 -0800 rcu: Increase RCU CPU stall timeouts if PROVE_RCU CONFIG_PROVE_RCU imposes additional overhead on the kernel, so increase the RCU CPU stall timeouts in an attempt to allow for this effect. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267830207-9474-2-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 3f379b03fbfddd20536389a85c6456f8233d1f8d Author: Paul E. McKenney Date: Fri Mar 5 15:03:25 2010 -0800 ftrace: Replace read_barrier_depends() with rcu_dereference_raw() Replace the calls to read_barrier_depends() in ftrace_list_func() with rcu_dereference_raw() to improve readability. The reason that we use rcu_dereference_raw() here is that removed entries are never freed, instead they are simply leaked. This is one of a very few cases where use of rcu_dereference_raw() is the long-term right answer. And I don't yet know of any others. ;-) Signed-off-by: Paul E. McKenney Acked-by: Steven Rostedt Cc: Frederic Weisbecker Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267830207-9474-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 2e95e3f668c85276ce699993596d3b52b0fcf4c5 Author: Benjamin Marzinski Date: Wed Mar 10 18:10:19 2010 -0600 GFS2: Allow the number of committed revokes to temporarily be negative GFS2 tracks the number of revokes and unrevokes that are part of committed transactions via sd_log_commited_revoke. It is possible for one process to add revokes during its transaction, while another process unrevokes them during its transaction. If the second process finishes its transaction first, sd_log_commited_revoke will be decremented by the number of unrevokes that the second process did, without first being incremented by the number of revokes the first process did. This is fine, since all started transactions must be completed before the journal can be flushed. However, sd_log_commited_revoke is an unsigned integer, and log_refund() causes an assertion failure if it would go negative at the end of a transaction. This patch makes sd_log_commited_revoke a signed integer and allows it to go negative. __gfs2_log_flush() still checks that it mataches the actual number of revokes. Signed-off-by: Benjamin Marzinski Signed-off-by: Steven Whitehouse commit dee60269f0fe90927ce5095eef3a8723bbb9c53e Merge: 51f5f8c 1382c71 Author: John W. Linville Date: Wed Mar 10 16:34:38 2010 -0500 Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit 51f5f8ca446d4c59041b9b6995821e13208897ea Author: Eric Dumazet Date: Wed Mar 10 17:13:36 2010 +0100 mac80211: Fix memory leak in ieee80211_if_write() Fix memory leak and use kmalloc() instead of kzalloc() as we are going to overwrite the allocated buffer. Signed-off-by: Eric Dumazet Signed-off-by: John W. Linville commit 2a13052fe495948e572839e514e0e0cd236c50b0 Author: Juuso Oikarinen Date: Tue Mar 9 14:25:02 2010 +0200 mac80211: Fix (dynamic) power save entry Currently hardware with !IEEE80211_HW_PS_NULLFUNC_STACK and IEEE80211_HW_REPORTS_TX_ACK_STATUS will never enter PSM due to the conditions in the power save entry functions. Fix those conditions. Signed-off-by: Juuso Oikarinen Cc: stable@kernel.org Signed-off-by: John W. Linville commit 41093167ec6c1854903a4bc38a37b5740c028984 Author: Zhu Yi Date: Tue Mar 9 16:05:31 2010 +0800 ipw2200: use kmalloc for large local variables Fixed below compiler warning: drivers/net/wireless/ipw2x00/ipw2200.c: In function ‘ipw_load_firmware’: drivers/net/wireless/ipw2x00/ipw2200.c:3260: warning: the frame size of 1168 bytes is larger than 1024 bytes Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 5f13bfac0718ce6f83ecba3755f224c3790e8d66 Author: Bruno Randolf Date: Tue Mar 9 16:56:10 2010 +0900 ath5k: read eeprom IQ calibration values correctly for G mode we read the IQ correction values (i_cal and q_cal) for G mode from a wrong location (the same shifts as for A mode is applied which is incorrect). use correct locations, matching the docs and HAL sources. also we should write IQ correction only when we have that information in the EEPROM, starting from version 4. also write it in the same way as we do in the periodic recalibration (enable last), just to be sure. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 86415d43efd4f7093979cfa8a80232114266f1a4 Author: Bruno Randolf Date: Tue Mar 9 16:56:05 2010 +0900 ath5k: fix I/Q calibration (for real) I/Q calibration was completely broken, resulting in a high number of CRC errors on received packets. before i could see around 10% to 20% CRC errors, with this patch they are between 0% and 3%. 1.) the removal of the mask in commit "ath5k: Fix I/Q calibration (f1cf2dbd0f798b71b1590e7aca6647f2caef1649)" resulted in no mask beeing used when writing the I/Q values into the register. additional errors in the calculation of the values (see 2.) resulted too high numbers, exceeding the masks, so wrong values like 0xfffffffe were written. to be safe we should always use the bitmask when writing parts of a register. 2.) using a (s32) cast for q_coff is a wrong conversion to signed, since we convert to a signed value later by substracting 128. this resulted in too low numbers for Q many times, which were limited to -16 by the boundary check later on. 3.) checked everything against the HAL sources and took over comments and minor optimizations from there. 4.) we can't use ENABLE_BITS when we want to write a number (the number can contain zeros). also always write the correction values first and set ENABLE bit last, like the HAL does. Signed-off-by: Bruno Randolf Cc: stable@kernel.org Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit a3b980fd1391e75068ae25f3817728b27bfdb04c Author: Bruno Randolf Date: Tue Mar 9 16:55:33 2010 +0900 ath5k: fix TSF reset to reset the TSF, AR5K_BEACON_RESET_TSF has to be 1, not 0. also we have a function for that so use it. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 8bd8beab49fec3f7d014c328641bd94de3df744b Author: Bruno Randolf Date: Tue Mar 9 16:55:23 2010 +0900 ath5k: use fixed antenna for tx descriptors when using a fixed antenna we should use the antenna number in all tx descriptors, otherwise the hardware will sometimes send the frame out on the other antenna. it seems like the hardware does not always respect the default antenna and diversity settings (esp. AR5K_STA_ID1_DEFAULT_ANTENNA). also i would like to note that antenna diversity does not always work correctly on 5414 (at least) when only one antenna is connected: for example all frames might be received on antenna A but still the HW tries to send on antenna B some times, causing packet loss. this is both verified with the antenna statistics output of the previous patch and a spectrum analyzer. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 8e59340e4fb65cfd748eaa1e23db057c52520f35 Author: Zhu Yi Date: Mon Mar 8 13:18:03 2010 +0800 libipw: split ieee->networks into small pieces The ieee->networks consists of 128 struct libipw_network entries. If we allocate this chunk of memory altogether, it ends up with an order 4 page allocation. High order page allocation is likely to fail on system high load. This patch splits the big chunk memory allocation into small pieces, each is 344 bytes, allocates them with 128 times. The patch fixed bug http://bugzilla.kernel.org/show_bug.cgi?id=14989 Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 38a679a52be13d5a0c766597ab823e06688d6e8e Author: Jouni Malinen Date: Sat Mar 6 18:35:08 2010 +0200 mac80211: Fix sta_mtx unlocking on insert STA failure path Commit 34e895075e21be3e21e71d6317440d1ee7969ad0 introduced sta_mtx locking into sta_info_insert() (now sta_info_insert_rcu), but forgot to unlock this mutex on one of the error paths. Fix this by adding the missing mutex_unlock() call for the case where STA insert fails due to an entry existing already. This may happen at least in AP mode when a STA roams between two BSSes (vifs). Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit e5a9a35cb9c0d92d7c986cb3696fb794be100087 Author: Helmut Schaa Date: Fri Mar 5 17:44:22 2010 +0100 rt2x00: remove KSEG1ADDR define from rt2x00soc.h Remove the KSEG1ADDR define from rt2x00soc.h as it redefines and covers the correct one from the arch/mips/include/asm/addrspace.h. Otherwise the driver oopses on the target platform (Ralink rt3050 board). Signed-off-by: Helmut Schaa Acked-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 717ea4b3474852057b1ce2c639ce219f4f8d3a8d Author: Greg Ungerer Date: Wed Mar 10 07:37:06 2010 -0800 net: add ColdFire support to the smc91x driver Some embedded ColdFire based boards use the SMC 91x family of ethernet devices. (For example the Freescale M5249C3 and MoretonBay NETtel). Add IO access support to the SMC91x driver, and allow this driver to be configured for ColdFire platforms. Signed-off-by: Greg Ungerer Signed-off-by: David S. Miller commit 7f29a3baa825725d29db399663790d15c78cddcf Author: Jussi Kivilinna Date: Tue Mar 9 12:24:38 2010 +0000 asix: fix setting mac address for AX88772 Setting new MAC address only worked when device was set to promiscuous mode. Fix MAC address by writing new address to device using undocumented command AX_CMD_READ_NODE_ID+1. Patch is tested with AX88772 device. Signed-off-by: Jussi Kivilinna Acked-by: David Hollis Signed-off-by: David S. Miller commit 2b4c32972b9bcfee29d5e2c1b6f261dda5ef2a21 Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Tue Mar 9 16:47:52 2010 +0000 ipv6 ip6_tunnel: eliminate unused recursion field from ip6_tnl{}. Commit a43912ab19... ("tunnel: eliminate recursion field") eliminated use of recursion field from tunnel structures, but its definition still exists in ip6_tnl{}. Let's remove that unused field. Signed-off-by: YOSHIFUJI Hideaki Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 3041f5170751e3522aa1bd6e8ca5d98e846720b0 Author: Eric Dumazet Date: Tue Mar 9 19:09:08 2010 +0000 net: Fix dev_mc_add() Commit 6e17d45a (net: add addr len check to dev_mc_add) added a bug in dev_mc_add(), since it can now exit with a lock imbalance. Signed-off-by: Eric Dumazet CC: Jiri Pirko Signed-off-by: David S. Miller commit 0a141509ede48ac33ef756ac1640f4d3f46fa2db Author: Eric Dumazet Date: Tue Mar 9 19:40:54 2010 +0000 net: Annotates neigh_invalidate() Annotates neigh_invalidate() with __releases() and __acquires() for sparse sake. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit bb134d5d9580fc7b945e3bca3c4b263947022966 Author: Eric Dumazet Date: Tue Mar 9 05:55:56 2010 +0000 tcp: Fix tcp_v4_rcv() Commit d218d111 (tcp: Generalized TTL Security Mechanism) added a bug for TIMEWAIT sockets. We should not test min_ttl for TW sockets. Reported-by: Tetsuo Handa Signed-off-by: Eric Dumazet Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit fe234f0e5cbb880792d2d1ac0743cf8c07e9dde3 Author: Louis Rilling Date: Tue Mar 9 06:14:41 2010 +0000 tg3: Fix tg3_poll_controller() passing wrong pointer to tg3_interrupt() Commit 09943a1819a240ff4a72f924d0038818fcdd0a90 Author: Matt Carlson Date: Fri Aug 28 14:01:57 2009 +0000 tg3: Convert ISR parameter to tnapi forgot to update tg3_poll_controller(), leading to intermittent crashes with netpoll. Fix this. Signed-off-by: Louis Rilling Cc: stable@kernel.org Signed-off-by: David S. Miller commit 78cb27939ff4fd66d7f76cfe7c59c0fdf1b29ed8 Author: Frank Blaschka Date: Mon Mar 8 20:36:57 2010 +0000 qeth: change checksumming default for HiperSockets Deactivate inbound checksumming on HiperSocket is a valid but dangerous optimization in case the frame is routed from an OSA network to an HiperSockets network. To go for sure we change the default to software checksumming. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 869da90b9ae39f0d5b9b5aa3a84502684a6aa1f4 Author: Ursula Braun Date: Mon Mar 8 20:36:56 2010 +0000 qeth: no recovery after layer mismatch (z/VM NICs) Depending on their definition in z/VM, virtual devices for z/VM VSWITCH or GuestLAN must be configured either in layer2 or in layer3 mode. If qeth detects a layer mismatch, device activation fails. Trying to recover from this error cannot help; thus scheduling a recovery should be avoided. In addition, since recovery is forbidden during online setting of a qeth device, existence of its network device is guaranteed for all dev_close() calls in qeth. The corresponding checks can be removed. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit a959189a978e0104e8aa7f1522f5eff42d891456 Author: Ursula Braun Date: Mon Mar 8 20:36:55 2010 +0000 qeth: set promisc off after trace disabling failure If HiperSockets Network Traffic Analyzer is switched off, but trace disabling fails somehow, the qeth driver does not switch off its promisc mode status. A following sniffer reactivation fails, since qeth does not see a need to reenable tracing. At the same time the code analyzing results of trace commands is restructured. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 21fde749cbf71d03e8cf87a7a9a45349597e138a Author: Frank Blaschka Date: Mon Mar 8 20:36:54 2010 +0000 qeth: l3 send dhcp in non pass thru mode dhcp frames are valid IPv4 packets so there is no need to send them in pass thru mode. This allows dhcp packets to pass HiperSockets. Also the dhcp release frame is send out correctly with this patch. Signed-off-by: Frank Blaschka Signed-off-by: Martin Schwidefsky Signed-off-by: David S. Miller commit fe7a26257a4191de6047f7e1d38832472eb22f85 Author: Ursula Braun Date: Mon Mar 8 20:36:53 2010 +0000 qeth: enable kmsg hash processing in qeth_core_sys.c provide qeth kmsg definitions to enable hash string generation for kernel message created with dev_err(). Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit dc1d628a67a8f042e711ea5accc0beedc3ef0092 Author: Peter Zijlstra Date: Wed Mar 3 15:55:04 2010 +0100 perf: Provide generic perf_sample_data initialization This makes it easier to extend perf_sample_data and fixes a bug on arm and sparc, which failed to set ->raw to NULL, which can cause crashes when combined with PERF_SAMPLE_RAW. It also optimizes PowerPC and tracepoint, because the struct initialization is forced to zero out the whole structure. Signed-off-by: Peter Zijlstra Acked-by: Jean Pihet Reviewed-by: Frederic Weisbecker Acked-by: David S. Miller Cc: Jamie Iles Cc: Paul Mackerras Cc: Stephane Eranian Cc: stable@kernel.org LKML-Reference: <20100304140100.315416040@chello.nl> Signed-off-by: Ingo Molnar commit 0e49887703015dd73667664c5abc9a6366641da9 Merge: 7d39cf6 89c0ac7 Author: Takashi Iwai Date: Wed Mar 10 09:01:30 2010 +0100 Merge branch 'topic/misc' into for-linus commit 7d39cf62242d52729ddff9a9ae195669f462d5c4 Merge: a3087ae ecd2162 Author: Takashi Iwai Date: Wed Mar 10 09:01:25 2010 +0100 Merge branch 'topic/hda' into for-linus commit 1382c71c764540880d35485b033a44ce104d8e2e Author: Reinette Chatre Date: Thu Feb 25 10:02:19 2010 -0800 Revert "iwlwifi: Send broadcast probe request only when asked to" This reverts commit 21b2d8bd2f0d4e0f21ade147fd193c8b9c1fd2b9. As explained by Johannes: When we build a probe request frame in the buffer with the SSID, we could arrive over the limit of 200 bytes. When we build it in the buffer without the SSID (wildcard) we don't arrive over 200 bytes, but the ucode still allows direct probe in addition because it has an internal buffer that is larger when it inserts the SSID... Signed-off-by: Reinette Chatre commit 1d79e53c56afe0826a311c3bc1653ad938166c22 Author: Reinette Chatre Date: Fri Feb 26 11:01:36 2010 -0800 iwl3945: fix memory corruption Recent patch "iwlwifi: move 3945 clip groups to 3945 data" exposed a memory corruption problem. When initializing the clip groups the code was mistakenly using the iwlagn rate count, not the 3945 rate count. This resulted in more memory being written than was allocated. "iwlwifi: move 3945 clip groups to 3945 data" moved the location where the clip groups are stored and the impact is now severe in that the number of configured TX queues is modified. Previously the "temperature" field was overwritten, which did not seem to affect the operation. Fix this one instance where wrong rate count was used. I also noticed one more location where the iwlagn rate count was used to index an iwl3945 array, fix this. I also modified one location that modified the iwlagn rate count to obtain the iwl3945 rate count ... just use the iwl3945 rate count directly. This fixes http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2165 and http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2168 Signed-off-by: Reinette Chatre commit ecd216260f87dd8c14b2580a16f055554644bbea Author: Ralf Gerbig Date: Tue Mar 9 18:25:47 2010 +0100 ALSA: hda - Sound MSI fallout on a Asus mobo NVIDIA MCP55 without the following patch audio ssttuutteerrs on ASUS M2N32-SLI PREMIUM ACPI BIOS Revision 1304 the sound device is: 00:0e.1 Audio device: nVidia Corporation MCP55 High Definition Audio (rev a2) worked with 2.6.32 Signed-off-by: Ralf Gerbig Cc: Signed-off-by: Takashi Iwai commit 3a065fcf9efed42ba736da7be528f2d3dec4965a Author: Akinobu Mita Date: Tue Feb 23 23:11:13 2010 +0900 udf: use ext2_find_next_bit Use ext2_find_next_bit (generic_find_next_le_bit) to find the set bit in little endian bitmap region. Signed-off-by: Akinobu Mita Signed-off-by: Jan Kara commit 5833ded9b6d783b8446349bada08f0f5e4227895 Author: Jan Kara Date: Fri Jan 8 16:52:59 2010 +0100 udf: Do not read inode before writing it We needlessly read inode in udf_update_inode just before zeroing out the contents of the buffer. Fix it. Signed-off-by: Jan Kara commit aae917cd188f397e9223001d9f6c0adfb339fd64 Author: Jan Kara Date: Fri Jan 8 16:46:29 2010 +0100 udf: Fix unalloc space handling in udf_update_inode Writing of inode holding unallocated space info was broken because we first cleared the buffer and after that checked whether it contains a tag meaning the block holds unallocated space information. Fix the problem by checking appropriate in memory flag instead. Also cleanup the function a bit along the way - most importantly lock buffer when modifying its contents, check for buffer_write_io_error instead of !buffer_uptodate, etc.. Signed-off-by: Jan Kara commit 548b84166917d6f5e2296123b85ad24aecd3801d Merge: cfb581b 57d5488 Author: Ingo Molnar Date: Tue Mar 9 17:11:53 2010 +0100 Merge commit 'v2.6.34-rc1' into perf/urgent Conflicts: tools/perf/util/probe-event.c Merge reason: Pick up -rc1 and resolve the conflict as well. Signed-off-by: Ingo Molnar commit e9edb1d8a345119c9baafa1b240eb1ec06a44662 Author: Christoph Hellwig Date: Wed Mar 3 08:53:51 2010 -0500 GFS2: do not select QUOTA gfs2 only needs the quotactl code, not the generic quota implementation. Signed-off-by: Christoph Hellwig Signed-off-by: Steven Whitehouse commit cfb581bcd4f8c158c6f2b48bf5e232bb9e6855c0 Author: Ingo Molnar Date: Mon Mar 8 15:20:50 2010 +0100 MAINTAINERS: Add Arnaldo as tools/perf/ co-maintainer Acked-by: Peter Zijlstra Acked-by: Paul Mackerras Acked-by: Arnaldo Carvalho de Melo LKML-Reference: Signed-off-by: Ingo Molnar commit 30124d11097e371e42052144d8a3f4a78d26e09f Author: Dave Kleikamp Date: Mon Mar 1 04:57:34 2010 +0000 powerpc/booke: Fix breakpoint/watchpoint one-shot behavior Another fix for the extended ptrace patches in the -next tree. The handling of breakpoints and watchpoints is inconsistent. When a breakpoint or watchpoint is hit, the interrupt handler is clearing the proper bits in the dbcr* registers, but leaving the dac* and iac* registers alone. The ptrace code to delete the break/watchpoints checks the dac* and iac* registers for zero to determine if they are enabled. Instead, they should check the dbcr* bits. Signed-off-by: Dave Kleikamp Signed-off-by: Benjamin Herrenschmidt commit a8e6da093ea8642b1320fb5d64134366f2a8d0ac Author: Vaidyanathan Srinivasan Date: Mon Mar 1 02:58:23 2010 +0000 powerpc: Reduce printk from pseries_mach_cpu_die() Remove debug printks in pseries_mach_cpu_die(). These are noisy at runtime. Traceevents can be added to instrument this section of code. The following KERN_INFO printks are removed: cpu 62 (hwid 62) returned from cede. Decrementer value = b2802fff Timebase value = 2fa8f95035f4a cpu 62 (hwid 62) got prodded to go online cpu 58 (hwid 58) ceding for offline with hint 2 Signed-off-by: Vaidyanathan Srinivasan Cc: Gautham R Shenoy Signed-off-by: Benjamin Herrenschmidt commit 0212f2602a38e740d5a96aba4cebfc2ebc993ecf Author: Vaidyanathan Srinivasan Date: Mon Mar 1 02:58:16 2010 +0000 powerpc: Move checks in pseries_mach_cpu_die() Rearrange condition checks for better code readability and prevention of possible race conditions when preferred_offline_state can potentially change during the execution of pseries_mach_cpu_die(). The patch will make pseries_mach_cpu_die() put cpu in one of the consistent states and not hit the run over BUG() Signed-off-by: Vaidyanathan Srinivasan Cc: Gautham R Shenoy Signed-off-by: Benjamin Herrenschmidt commit 8dbce53cc249a76e9450708d291fce5a7e29c6a1 Author: Vaidyanathan Srinivasan Date: Mon Mar 1 02:58:09 2010 +0000 powerpc: Reset kernel stack on cpu online from cede state Cpu hotplug (offline) without dlpar operation will place cpu in cede state and the extended_cede_processor() function will return when resumed. Kernel stack pointer needs to be reset before start_secondary() is called to continue the online operation. Added new function start_secondary_resume() to do the above steps. Signed-off-by: Vaidyanathan Srinivasan Cc: Gautham R Shenoy Signed-off-by: Benjamin Herrenschmidt commit de0b632ba05bc88949e67d33d1c313fcf922ae2e Author: Josh Boyer Date: Fri Feb 5 03:52:16 2010 +0000 powerpc: Fix G5 thermal shutdown This changes the thresholds for the liquid cooled G5 thermal shutdown mechanism to prevent an errant shutdown with some models. Signed-off-by: David Woodhouse Signed-off-by: Benjamin Herrenschmidt commit f09b7b2a1115d3afe02c66156746287f6c63bba0 Author: Mark Nelson Date: Sun Jan 31 20:12:58 2010 +0000 powerpc/pseries: Pass CPPR value to H_XIRR hcall Now that we properly keep track of the CPPR value (since 49bd3647134ea47420067aea8d1401e722bf2aac, "powerpc/pseries: Track previous CPPR values to correctly EOI interrupts") we can pass it to the H_XIRR hcall. This is needed because the Partition Adjunct Option of new versions of pHyp extend the H_XIRR hcall to include the CPPR as an input parameter. Earlier versions not supporting this option just disregard the extra input parameter, so this doesn't cause any problems for existing systems. The Partition Adjunct Option is required for future systems that will support SR-IOV capable devices. Signed-off-by: Mark Nelson Signed-off-by: Benjamin Herrenschmidt commit 856f70a368022645a08fbecc5d30ec218f13232d Author: Dave Kleikamp Date: Tue Feb 23 09:43:17 2010 +0000 powerpc/booke: Fix a couple typos in the advanced ptrace code powerpc/booke: Fix a couple typos in the advanced ptrace code Found and fixed a couple typos in the advanced ptrace patches. (These patches are currently in benh's next tree.) Signed-off-by: Dave Kleikamp Cc: Benjamin Herrenschmidt Cc: linuxppc-dev list Signed-off-by: Benjamin Herrenschmidt commit 5b72d74ce2fccca2a301de60f31b16ddf5c93984 Author: Adam Lackorzynski Date: Sat Feb 27 07:07:59 2010 +0000 powerpc: Fix SMP build with disabled CPU hotplugging. Compiling 2.6.33 with SMP enabled and HOTPLUG_CPU disabled gives me the following link errors: LD init/built-in.o LD .tmp_vmlinux1 arch/powerpc/platforms/built-in.o: In function `.smp_xics_setup_cpu': smp.c:(.devinit.text+0x88): undefined reference to `.set_cpu_current_state' smp.c:(.devinit.text+0x94): undefined reference to `.set_default_offline_state' arch/powerpc/platforms/built-in.o: In function `.smp_pSeries_kick_cpu': smp.c:(.devinit.text+0x13c): undefined reference to `.set_preferred_offline_state' smp.c:(.devinit.text+0x148): undefined reference to `.get_cpu_current_state' smp.c:(.devinit.text+0x1a8): undefined reference to `.get_cpu_current_state' make: *** [.tmp_vmlinux1] Error 1 The following change fixes that for me and seems to work as expected. Signed-off-by: Adam Lackorzynski Signed-off-by: Benjamin Herrenschmidt commit 1426d5a3bd07589534286375998c0c8c6fdc5260 Author: Michael Ellerman Date: Thu Jan 28 13:23:22 2010 +0000 powerpc: Dynamically allocate pacas On 64-bit kernels we currently have a 512 byte struct paca_struct for each cpu (usually just called "the paca"). Currently they are statically allocated, which means a kernel built for a large number of cpus will waste a lot of space if it's booted on a machine with few cpus. We can avoid that by only allocating the number of pacas we need at boot. However this is complicated by the fact that we need to access the paca before we know how many cpus there are in the system. The solution is to dynamically allocate enough space for NR_CPUS pacas, but then later in boot when we know how many cpus we have, we free any unused pacas. Signed-off-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt commit 59603b9ae426e968d452f9325cdcff308573dee7 Merge: 57d5488 a111065 Author: Benjamin Herrenschmidt Date: Tue Mar 9 11:51:57 2010 +1100 Merge commit 'kumar/next' into merge commit 522dba7134d6b2e5821d3457f7941ec34f668e6d Merge: 51d0f6d bb910a7 Author: Linus Torvalds Date: Mon Mar 8 16:10:29 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI/PM Runtime: Make runtime PM of PCI devices inactive by default commit 51d0f6d1f50349579f007adf5c0b51aaedd93b94 Merge: 57d5488 da495ec Author: Linus Torvalds Date: Mon Mar 8 14:07:53 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: kfree correct pointer during mount option parsing Btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL commit da495ecc0fb096b383754952a1c152147bc95b52 Author: Josef Bacik Date: Thu Feb 25 20:38:35 2010 +0000 Btrfs: kfree correct pointer during mount option parsing We kstrdup the options string, but then strsep screws with the pointer, so when we kfree() it, we're not giving it the right pointer. Tested-by: Andy Lutomirski Signed-off-by: Chris Mason commit 6bef4d317193d3badbbfa3f3c593758ace84a629 Author: Eric Paris Date: Tue Feb 23 19:43:04 2010 +0000 Btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL btrfs inialize rb trees in quite a number of places by settin rb_node = NULL; The problem with this is that 17d9ddc72fb8bba0d4f678 in the linux-next tree adds a new field to that struct which needs to be NULL for the new rbtree library code to work properly. This patch uses RB_ROOT as the intializer so all of the relevant fields will be NULL'd. Without the patch I get a panic. Signed-off-by: Eric Paris Acked-by: Venkatesh Pallipadi Signed-off-by: Chris Mason commit 42d38041a94cef1e38f7b8ab9827881022a183a9 Author: Wolfgang Grandegger Date: Mon Mar 8 12:51:41 2010 -0800 MAINTAINERS: add netdev to CAN network layer and drivers entries Signed-off-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit de5865714621e23d65c52955ca2125dbb074c242 Author: Neil Horman Date: Mon Mar 8 12:43:56 2010 -0800 tipc: filter out messages not intended for this host Port commit 20deb48d16fdd07ce2fdc8d03ea317362217e085 from git://tipc.cslab.ericsson.net/pub/git/people/allan/tipc.git Part of the large effort I'm trying to help with getting all the downstreamed code from windriver forward ported to the upstream tree Origional commit message Restore check to filter out inadverdently received messages This patch reimplements a check that allows TIPC to discard messages that are not intended for it. This check was present in TIPC 1.5/1.6, but was removed by accident during the development of TIPC 1.7; it has now been updated to account for new features present in TIPC 1.7 and reinserted into TIPC. The main benefit of this check is to filter out messages arriving from orphaned link endpoints, which can arise when a node exits the network and then re-enters it with a different TIPC network address (i.e. value). Signed-off-by: Neil Horman Origionally-authored-by: Allan Stephens Signed-off-by: David S. Miller commit 91e013827c0bcbb187ecf02213c5446b6f62d445 Merge: 988addf 8d2b09f Author: Russell King Date: Mon Mar 8 20:24:11 2010 +0000 Merge branch 'master' into for-linus commit 988addf82e4c03739375279de73929580a2d4a6a Merge: 004c1c7 25cf84c Author: Russell King Date: Mon Mar 8 20:21:04 2010 +0000 Merge branch 'origin' into devel-stable Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c commit d88dca79d3852a3623f606f781e013d61486828a Author: Neil Horman Date: Mon Mar 8 12:20:58 2010 -0800 tipc: fix endianness on tipc subscriber messages Remove htohl implementation from tipc I was working on forward porting the downstream commits for TIPC and ran accross this one: http://tipc.cslab.ericsson.net/cgi-bin/gitweb.cgi?p=people/allan/tipc.git;a=commitdiff;h=894279b9437b63cbb02405ad5b8e033b51e4e31e I was going to just take it, when I looked closer and noted what it was doing. This is basically a routine to byte swap fields of data in sent/received packets for tipc, dependent upon the receivers guessed endianness of the peer when a connection is established. Asside from just seeming silly to me, it appears to violate the latest RFC draft for tipc: http://tipc.sourceforge.net/doc/draft-spec-tipc-02.txt Which, according to section 4.2 and 4.3.3, requires that all fields of all commands be sent in network byte order. So instead of just taking this patch, instead I'm removing the htohl function and replacing the calls with calls to ntohl in the rx path and htonl in the send path. As part of this fix, I'm also changing the subscr_cancel function, which searches the list of subscribers, using a memcmp of the entire subscriber list, for the entry to tear down. unfortunately it memcmps the entire tipc_subscr structure which has several bits that are private to the local side, so nothing will ever match. section 5.2 of the draft spec indicates the tuple should uniquely identify a subscriber, so convert subscr_cancel to just match on those fields (properly endian swapped). I've tested this using the tipc test suite, and its passed without issue. Signed-off-by: Neil Horman Signed-off-by: David S. Miller commit f5c445ed4148434f142be0263a8ad7cb58503e8a Author: Eric Dumazet Date: Mon Mar 8 12:17:04 2010 -0800 ethtool: Use noinline_for_stack Use self documenting noinline_for_stack instead of duplicated comments. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 81160e66cca3d3a16b7d88e0e2dccfc5c76f36f9 Author: Joe Perches Date: Mon Mar 8 12:15:59 2010 -0800 net/sunrpc: Convert (void)snprintf to snprintf (Applies on top of "Remove uses of NIPQUAD, use %pI4") Casts to void of snprintf are most uncommon in kernel source. 9 use casts, 1301 do not. Remove the remaining uses in net/sunrpc/ Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit fc0b579168cbe737c83c6b9bbfe265d3ae6baca6 Author: Joe Perches Date: Mon Mar 8 12:15:28 2010 -0800 net/sunrpc: Remove uses of NIPQUAD, use %pI4 Originally submitted Jan 1, 2010 http://patchwork.kernel.org/patch/71221/ Convert NIPQUAD to the %pI4 format extension where possible Convert %02x%02x%02x%02x/NIPQUAD to %08x/ntohl Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit e9dcd1613f0ac0b3573b7d813a2c5672cd8302eb Author: Barry Song Date: Mon Mar 8 12:13:57 2010 -0800 can: fix bfin_can build error after alloc_candev() change Looks like commit a6e4bc530403 didn't include updates to drivers so the Blackfin CAN driver fails to build now. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit 28b2774a0d5852236dab77a4147b8b88548110f1 Author: Eric Dumazet Date: Mon Mar 8 11:32:01 2010 -0800 tcp: Fix tcp_make_synack() Commit 4957faad (TCPCT part 1g: Responder Cookie => Initiator), part of TCP_COOKIE_TRANSACTION implementation, forgot to correctly size synack skb in case user data must be included. Many thanks to Mika Pentillä for spotting this error. Reported-by: Penttillä Mika Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 9837638727488922727b0cfd438039fa73364183 Author: Eric Dumazet Date: Mon Mar 8 03:20:00 2010 +0000 net: fix route cache rebuilds We added an automatic route cache rebuilding in commit 1080d709fb9d8cd43 but had to correct few bugs. One of the assumption of original patch, was that entries where kept sorted in a given way. This assumption is known to be wrong (commit 1ddbcb005c395518 gave an explanation of this and corrected a leak) and expensive to respect. Paweł Staszewski reported to me one of his machine got its routing cache disabled after few messages like : [ 2677.850065] Route hash chain too long! [ 2677.850080] Adjust your secret_interval! [82839.662993] Route hash chain too long! [82839.662996] Adjust your secret_interval! [155843.731650] Route hash chain too long! [155843.731664] Adjust your secret_interval! [155843.811881] Route hash chain too long! [155843.811891] Adjust your secret_interval! [155843.858209] vlan0811: 5 rebuilds is over limit, route caching disabled [155843.858212] Route hash chain too long! [155843.858213] Adjust your secret_interval! This is because rt_intern_hash() might be fooled when computing a chain length, because multiple entries with same keys can differ because of TOS (or mark/oif) bits. In the rare case the fast algorithm see a too long chain, and before taking expensive path, we call a helper function in order to not count duplicates of same routes, that only differ with tos/mark/oif bits. This helper works with data already in cpu cache and is not be very expensive, despite its O(N^2) implementation. Paweł Staszewski sucessfully tested this patch on his loaded router. Reported-and-tested-by: Paweł Staszewski Signed-off-by: Eric Dumazet Acked-by: Neil Horman Signed-off-by: David S. Miller commit 1515faf2f995add976d4428bbc1583a4a0c81e5f Author: Amit Kumar Salecha Date: Mon Mar 8 00:14:50 2010 +0000 qlcnic: remove extra space from board names Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit addd5abf49be31787aeb6203d266e0bd31a3fadd Author: Amit Kumar Salecha Date: Mon Mar 8 00:14:49 2010 +0000 qlcnic: fix bios version check Bios sub version from unified fw image is calculated incorrect. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit b7eff1007fea3d153a9a5c0f872304ec19412bbb Author: Sucheta Chakraborty Date: Mon Mar 8 00:14:48 2010 +0000 qlcnic: validate unified fw image Validate all sections of unified fw image, before accessing them, to avoid seg fault. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 9ab17b3968f9521bb4fffd8767953d2b0148aad0 Author: Sucheta Chakraborty Date: Mon Mar 8 00:14:47 2010 +0000 qlcnic: fix multicast handling For promiscuous mode, driver send request to device for deleting multicast addresses and again it send request for adding them back while exiting from this mode, this is bad for performance. Just setting device in promiscuous mode is enough, no need to del/add multicast addresses. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 8bfe8b91b8b877066c8ac788f59a40324eaac6d8 Author: Sucheta Chakraborty Date: Mon Mar 8 00:14:46 2010 +0000 qlcnic: additional driver statistics. Statistics added for lro/lso bytes, count for tx stop queue and wake queue and skb alloc failure count. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 8bae5698616ac336938684ce7a7370299bd55d01 Author: Sucheta Chakraborty Date: Mon Mar 8 00:14:45 2010 +0000 qlcnic: fix tx csum status Kernel default tx csum function (ethtool_op_get_tx_csum) doesn't show correct csum status. It takes various FLAGS (NETIF_F_ALL_CSUM) in account to show tx csum status, which driver doesn't set while disabling tx csum. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 7e8a9298adf7531c58d73ba9c499353e3807cf19 Author: Ajit Khaparde Date: Sun Mar 7 14:23:44 2010 +0000 be2net: remove unused code in be_load_fw This patch cleans up some unused code from be_load_fw(). Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 500ca9ba241304937c54c379e515b24400379353 Author: Ajit Khaparde Date: Sun Mar 7 14:21:27 2010 +0000 be2net: remove usage of be_pci_func When PCI functions are virtuialized in applications by assigning PCI functions to VM (PCI passthrough), the be2net driver in the VM sees a different function number. So, use of PCI function number in any calculation will break existing code. This patch takes care of it. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 6cce09f87a04797fae5b947ef2626c14a78f0b49 Author: Eric Dumazet Date: Sun Mar 7 23:21:57 2010 +0000 tcp: Add SNMP counters for backlog and min_ttl drops Commit 6b03a53a (tcp: use limited socket backlog) added the possibility of dropping frames when backlog queue is full. Commit d218d111 (tcp: Generalized TTL Security Mechanism) added the possibility of dropping frames when TTL is under a given limit. This patch adds new SNMP MIB entries, named TCPBacklogDrop and TCPMinTTLDrop, published in /proc/net/netstat in TcpExt: line netstat -s | egrep "TCPBacklogDrop|TCPMinTTLDrop" TCPBacklogDrop: 0 TCPMinTTLDrop: 0 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 4045635318538d3ddd2007720412fdc4b08f6a62 Author: Zhu Yi Date: Sun Mar 7 16:21:39 2010 +0000 net: add __must_check to sk_add_backlog Add the "__must_check" tag to sk_add_backlog() so that any failure to check and drop packets will be warned about. Signed-off-by: Zhu Yi Signed-off-by: David S. Miller commit 89c0ac7cab2440a771ba1e2ab953186bc9c29786 Author: Randy Dunlap Date: Mon Mar 8 09:32:42 2010 -0800 sound: fix opti92x-ad1848 build Fix 'else' placement in ifdef block so that build succeeds: sound/isa/opti9xx/opti92x-ad1848.c:221: error: 'else' without a previous 'if' Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai commit 004c1c7096659d352b83047a7593e91d8a30e3c5 Merge: 882d01f 3b05007 Author: Russell King Date: Mon Mar 8 16:08:46 2010 +0000 Merge branch 'for-rmk/samsung6' of git://git.fluff.org/bjdooks/linux into devel-stable commit 318ae2edc3b29216abd8a2510f3f80b764f06858 Merge: 25cf84c 3e58974 Author: Jiri Kosina Date: Mon Mar 8 16:55:37 2010 +0100 Merge branch 'for-next' into for-linus Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c commit 5311114d4867113c00f78829d4ce14be458ec925 Author: Takashi Iwai Date: Mon Mar 8 12:13:07 2010 +0100 ALSA: hda - Fix input source elements of secondary ADCs on Realtek Since alc_auto_create_input_ctls() doesn't set the elements for the secondary ADCs, "Input Source" elemtns for these also get empty, resulting in buggy outputs of alsactl like: control.14 { comment.access 'read write' comment.type ENUMERATED comment.count 1 iface MIXER name 'Input Source' index 1 value 0 } This patch fixes alc_mux_enum_*() (and others) to fall back to the first entry if the secondary input mux is empty. Signed-off-by: Takashi Iwai Cc: commit 50ae0aa8f55813b2cc5e5b7f589f328b8fcd45ec Author: Takashi Iwai Date: Mon Mar 8 12:09:59 2010 +0100 ALSA: hda - Fix wrong model range check for ALC268 Fix a wrong value passed to snd_hda_check_board_codec_sid_config() as the upper-limit in parse_alc268(), so that any wrong value can't be passed. So far, no bogus value was set in the quirk entries, so this won't give any behavioral changes. Signed-off-by: Takashi Iwai commit 10cc2b50eb4b01ca4dc014af2094d28b4ebe20d7 Author: Herbert Xu Date: Fri Mar 5 21:03:35 2010 +0000 bridge: Fix RCU race in br_multicast_stop Thanks to Paul McKenny for pointing out that it is incorrect to use synchronize_rcu_bh to ensure that pending callbacks have completed. Instead we should use rcu_barrier_bh. Reported-by: Paul E. McKenney Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 49f5fcfd4ac3df24aa66520e1c5f37db5dfa8c10 Author: Herbert Xu Date: Fri Mar 5 21:07:39 2010 +0000 bridge: Use RCU list primitive in __br_mdb_ip_get As Paul McKenney correctly pointed out, __br_mdb_ip_get needs to use the RCU list walking primitive in order to work correctly on platforms where data-dependency ordering is not guaranteed. Reported-by: Paul E. McKenney Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 0c9a2ac1f8a2e55b3382dfc27256878a58ea49e9 Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Sun Mar 7 00:14:44 2010 +0000 ipv6: Optmize translation between IPV6_PREFER_SRC_xxx and RT6_LOOKUP_F_xxx. IPV6_PREFER_SRC_xxx definitions: | #define IPV6_PREFER_SRC_TMP 0x0001 | #define IPV6_PREFER_SRC_PUBLIC 0x0002 | #define IPV6_PREFER_SRC_COA 0x0004 RT6_LOOKUP_F_xxx definitions: | #define RT6_LOOKUP_F_SRCPREF_TMP 0x00000008 | #define RT6_LOOKUP_F_SRCPREF_PUBLIC 0x00000010 | #define RT6_LOOKUP_F_SRCPREF_COA 0x00000020 So, we can translate between these two groups by shift operation instead of multiple 'if's. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 25dc27d17dc868aae78fd03bef3113cf586b12e5 Author: Florian Fainelli Date: Sun Mar 7 00:55:50 2010 +0000 cpmac: bump version to 0.5.2 Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 9fba1c31f4f3f9f860a4afee0b409cde27d06741 Author: Florian Fainelli Date: Sun Mar 7 00:55:47 2010 +0000 cpmac: fallback to switch mode if no PHY chip found If we were unable to detect a PHY on any of the MDIO bus id we tried instead of bailing out with -ENODEV, assume the MAC is connected to a switch and use MDIO bus 0. This unbreaks quite a lot of devices out there whose switch cannot be detected. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 30765d0502905a9248e5de72fc7ac83c23422861 Author: Florian Fainelli Date: Sun Mar 7 00:55:26 2010 +0000 cpmac: fix the receiving of 802.1q frames Despite what the comment above CPMAC_SKB_SIZE says, the hardware also needs to account for the FCS length in a received frame. This patch fix the receiving of 802.1q frames which have 4 more bytes. While at it unhardcode the definition and use the one from if_vlan.h. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 8d15d3864a733476931f7e0b3d82824cddc766c2 Author: Oliver Hartkopp Date: Sat Mar 6 08:31:50 2010 +0000 MAINTAINER: Correct CAN Maintainer responsibilities and paths Update the CAN Maintainer responsibilities and add source paths. Additional the SocketCAN core ML is not subscribers-only anymore. Signed-off-by: Oliver Hartkopp Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit e7111eac8ebda724d1e4d9e6aaf4569744a584d5 Author: Petko Manolov Date: Sun Mar 7 06:10:01 2010 +0000 another pegasus usb net device This one removes trailing whitespace in pegasus.h and more importantly adds new Pegasus compatible device. Signed-off-by: Julian Brown Signed-off-by: Petko Manolov Signed-off-by: David S. Miller commit 0e2b807234c42fab59f98ec913db30dfda0e63a7 Author: Dan Carpenter Date: Sun Mar 7 02:35:42 2010 +0000 irda-usb: add error handling and fix leak If the call to kcalloc() fails then we should return -ENOMEM. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 72150e9b7fec217fbd646a29ea2f65a3d4d55ea9 Author: Dan Carpenter Date: Sat Mar 6 01:04:45 2010 +0000 sock.c: potential null dereference We test that "prot->rsk_prot" is non-null right before we dereference it on this line. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit ea3fb371b2a391958670f2a65e1203f7dba61671 Author: Dan Carpenter Date: Sat Mar 6 01:11:38 2010 +0000 ems_usb: cleanup: remove uneeded check "skb" is alway non-null here, but even if it were null the check isn't needed because dev_kfree_skb() can handle it. This eliminates a smatch warning about dereferencing a variable before checking that it is non-null. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 02a780c014c40973cbe71d04cec7a24e6629995f Author: Dan Carpenter Date: Sat Mar 6 01:14:09 2010 +0000 bridge: cleanup: remove unneed check We dereference "port" on the lines immediately before and immediately after the test so port should hopefully never be null here. Signed-off-by: Dan Carpenter Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b96b894c518bc7399e6b86b635b5e8cd7356a8e9 Author: Figo.zhang Date: Fri Mar 5 16:36:02 2010 +0000 fix a race in ks8695_poll fix a race at the end of NAPI processing in ks8695_poll() function. Signed-off-by:Figo.zhang Signed-off-by: David S. Miller commit 3b05007e43ea629394e89ea0b023d7b15375a2bb Merge: f9fed7c 41f23a0 Author: Ben Dooks Date: Sun Mar 7 22:56:19 2010 +0000 ARM: Merge next-samsung-s3c2443-clock Merge branch 'next-samsung-s3c2443-clock' into next-samsung commit 41f23a09f32124322dc41bea7f65baff6e9b0ac5 Author: Ben Dooks Date: Sat Jan 30 11:14:14 2010 +0200 ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock Add set_rate and round_rate calls to armdiv for future use with cpu frequency scaling. Signed-off-by: Ben Dooks commit 71ed587d4a5d377ef5a6917043543ff949ff7dcf Author: Ben Dooks Date: Sat Jan 30 10:49:15 2010 +0200 ARM: S3C2443: Remove #if 0 for clk_mpll The clk_mpll has long been moved into common clock code, remove the code completely instead of the nasty #if 0 block. Signed-off-by: Ben Dooks commit 2dd5f181420ae8ea1cb976b81ed87517f0d4fcd7 Author: Ben Dooks Date: Sat Jan 30 10:46:52 2010 +0200 ARM: S3C2443: Update notes on MPLLREF clock Add note on MPLLREF clock source and why it cannot be easily removed. Signed-off-by: Ben Dooks commit 4bed36b2c5b3248ae6f9aaf5194fbe85153e4026 Author: Ben Dooks Date: Sat Jan 30 10:25:49 2010 +0200 ARM: S3C2443: Further clksrc-clk conversions Move more of the core clocks that where left over from the last commit as they are much more core to the system operation. This should allow for easier tracking of any problems. Signed-off-by: Ben Dooks commit 9aa753c4422492547a190df8a3b6a56282669f9b Author: Ben Dooks Date: Sat Jan 30 09:19:59 2010 +0200 ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation The S3C2443 clock code could easily make use of the clksrc implementation in plat-samsung for many of the clocks. Make the clocks that easily move to clksrc-clk over, update any initialisation and remove the old register definitions from the header file (it is only being used once). Signed-off-by: Ben Dooks commit f9fed7cd7efaa0d050f21f6f9ed532d3143b7369 Author: Mark Brown Date: Mon Mar 1 18:51:42 2010 +0000 USB: Fix s3c-hsotg build following Samsung platform header moves Fix a reference to regs-sys.h got missed in the reorganisation of the Samsung platform headers targetted for 2.6.34. Signed-off-by: Mark Brown Acked-by: Greg Kroah-Hartman Signed-off-by: Ben Dooks commit 0ea5357f2e02aa3741daddf71dd8b2f3b313db74 Author: Mark Brown Date: Fri Mar 5 10:47:23 2010 +0000 ARM: S3C64XX: Reintroduce unconditional build of audio device Ben Dooks' commit cf9814eb (ARM: S3C64XX: Make audio device code built unconditionally) made the struct devices for the audio blocks in the S3C64xx series processors be built unconditionally but this change seems to have gone AWOL in the various Samsung platform moves this release cycle, causing link failures with machine drivers that rely on it. Reintroduce the change. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 8d2b09f5b0de2c0e37f50d04980bc81098988239 Author: Rabin Vincent Date: Mon Mar 1 05:01:25 2010 +0100 ARM: 5961/1: ux500: fix CLKRST addresses Correct the base addresses of the CLKRST registers. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 51d47999b9452a8dc7ae58a11423c5db28f21ae1 Author: Laurent Pinchart Date: Thu Mar 4 15:33:16 2010 +0100 ARM: 5977/1: arm: Enable backtrace printing on oops when PC is corrupted If PC points outside kernel text, start printing the backtrace at LR instead. Signed-off-by: Laurent Pinchart Signed-off-by: Russell King commit 0e95017355dcf43031da6d0e360a748717e56df1 Author: Tim Bird Date: Thu Feb 25 15:36:43 2010 -0800 function-graph: Add tracing_thresh support to function_graph tracer Add support for tracing_thresh to the function_graph tracer. This version of this feature isolates the checks into new entry and return functions, to avoid adding more conditional code into the main function_graph paths. When the tracing_thresh is set and the function graph tracer is enabled, only the functions that took longer than the time in microseconds that was set in tracing_thresh are recorded. To do this efficiently, only the function exits are recorded: [tracing]# echo 100 > tracing_thresh [tracing]# echo function_graph > current_tracer [tracing]# cat trace # tracer: function_graph # # CPU DURATION FUNCTION CALLS # | | | | | | | 1) ! 119.214 us | } /* smp_apic_timer_interrupt */ 1) <========== | 0) ! 101.527 us | } /* __rcu_process_callbacks */ 0) ! 126.461 us | } /* rcu_process_callbacks */ 0) ! 145.111 us | } /* __do_softirq */ 0) ! 149.667 us | } /* do_softirq */ 0) ! 168.817 us | } /* irq_exit */ 0) ! 248.254 us | } /* smp_apic_timer_interrupt */ Also, add support for specifying tracing_thresh on the kernel command line. When used like so: "tracing_thresh=200 ftrace=function_graph" this can be used to analyse system startup. It is important to disable tracing soon after boot, in order to avoid losing the trace data. Acked-by: Frederic Weisbecker Signed-off-by: Tim Bird LKML-Reference: <4B87098B.4040308@am.sony.com> Signed-off-by: Steven Rostedt commit 1acaa1b2d9b5904c9cce06122990a2d71046ce16 Author: Arnaldo Carvalho de Melo Date: Fri Mar 5 18:23:50 2010 -0300 tracing: Update the comm field in the right variable in update_max_tr The latency output showed: # | task: -3 (uid:0 nice:0 policy:1 rt_prio:99) The comm is missing in the "task:" and it looks like a minus 3 is the output. The correct display should be: # | task: migration/0-3 (uid:0 nice:0 policy:1 rt_prio:99) The problem is that the comm is being stored in the wrong data structure. The max_tr.data[cpu] is what stores the comm, not the tr->data[cpu]. Before this patch the max_tr.data[cpu]->comm was zeroed and the /debug/trace ended up showing just the '-' sign followed by the pid. Also remove a needless initialization of max_data. Signed-off-by: Arnaldo Carvalho de Melo LKML-Reference: <1267824230-23861-1-git-send-email-acme@infradead.org> Signed-off-by: Steven Rostedt commit a094fe04c751698a18c3a0d376a3bdb117f1e0d8 Author: Steven Rostedt Date: Fri Mar 5 20:08:58 2010 -0500 function-graph: Use comment notation for func names of dangling '}' When a '}' does not have a matching function start, the name is printed within parenthesis. But this makes it confusing between ending '}' and function starts. This patch makes the function name appear in C comment notation. Old view: 3) 1.281 us | } (might_fault) 3) 3.620 us | } (filldir) 3) 5.251 us | } (call_filldir) 3) | call_filldir() { 3) | filldir() { New view: 3) 1.281 us | } /* might_fault */ 3) 3.620 us | } /* filldir */ 3) 5.251 us | } /* call_filldir */ 3) | call_filldir() { 3) | filldir() { Requested-by: Ingo Molnar Signed-off-by: Steven Rostedt commit 801c29fd1fdeb84f60241beb445ff5db154450ae Author: Steven Rostedt Date: Fri Mar 5 20:02:19 2010 -0500 function-graph: Fix unused reference to ftrace_set_func() The declaration of ftrace_set_func() is at the start of the ftrace.c file and wrapped with a #ifdef CONFIG_FUNCTION_GRAPH condition. If function graph tracing is enabled but CONFIG_DYNAMIC_FTRACE is not, a warning about that function being declared static and unused is given. This really should have been placed within the CONFIG_FUNCTION_GRAPH condition that uses ftrace_set_func(). Moving the declaration down fixes the warning and makes the code cleaner. Reported-by: Peter Zijlstra Signed-off-by: Steven Rostedt commit bb910a7040e90a0ca3d3e8245d6d5c128a5d1287 Author: Rafael J. Wysocki Date: Sat Feb 27 21:37:37 2010 +0100 PCI/PM Runtime: Make runtime PM of PCI devices inactive by default Make the run-time power management of PCI devices be inactive by default by calling pm_runtime_forbid() for each PCI device during its initialization. This setting may be overriden by the user space with the help of the /sys/devices/.../power/control interface. That's necessary to avoid breakage on systems where ACPI-based wake-up is known to fail for some devices. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 3a22813a5aaf8e8c72be575dabe0ba26f9352f4d Author: Breno Leitao Date: Thu Mar 4 10:40:44 2010 +0000 s2io: Fixing debug message Currently s2io is dumping debug messages using the interface name before it was allocated, showing a message like the following: s2io: eth%d: Ring Mem PHY: 0x7ef80000 s2io: s2io_reset: Resetting XFrame card eth%d This patch just fixes it, printing the pci bus information for the card instead of the interface name. Signed-off-by: Breno Leitao Signed-off-by: David S. Miller commit a80483d3722b603dae8a52495f8d88a7d4b1bf1c Author: Jesse Brandeburg Date: Fri Mar 5 02:21:44 2010 +0000 e1000e: fix packet corruption and tx hang during NFSv2 when receiving a particular type of NFS v2 UDP traffic, the hardware could DMA some bad data and then hang, possibly corrupting memory. Disable the NFS parsing in this hardware, verified to fix the bug. Originally reported and reproduced by RedHat's Neil Horman CC: nhorman@tuxdriver.com Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Acked-by: Neil Horman Signed-off-by: David S. Miller commit 5fe88eae26dbd24eed73eb0b681e13981fd486b3 Author: David Dillow Date: Thu Mar 4 04:37:16 2010 +0000 typhoon: fix incorrect use of smp_wmb() The typhoon driver was incorrectly using smp_wmb() to order memory accesses against IO to the NIC in a few instances. Use wmb() instead, which is required to actually order between memory types. Signed-off-by: David Dillow Signed-off-by: David S. Miller commit d17792ebdf90289c9fd1bce888076d3d60ecd53b Author: Jeff Garzik Date: Thu Mar 4 08:21:53 2010 +0000 ethtool: Add direct access to ops->get_sset_count On 03/04/2010 09:26 AM, Ben Hutchings wrote: > On Thu, 2010-03-04 at 00:51 -0800, Jeff Kirsher wrote: >> From: Jeff Garzik >> >> This patch is an alternative approach for accessing string >> counts, vs. the drvinfo indirect approach. This way the drvinfo >> space doesn't run out, and we don't break ABI later. > [...] >> --- a/net/core/ethtool.c >> +++ b/net/core/ethtool.c >> @@ -214,6 +214,10 @@ static noinline int ethtool_get_drvinfo(struct net_device *dev, void __user *use >> info.cmd = ETHTOOL_GDRVINFO; >> ops->get_drvinfo(dev,&info); >> >> + /* >> + * this method of obtaining string set info is deprecated; >> + * consider using ETHTOOL_GSSET_INFO instead >> + */ > > This comment belongs on the interface (ethtool.h) not the > implementation. Debatable -- the current comment is located at the callsite of ops->get_sset_count(), which is where an implementor might think to add a new call. Not all the numeric fields in ethtool_drvinfo are obtained from ->get_sset_count(). Hence the "some" in the attached patch to include/linux/ethtool.h, addressing your comment. > [...] >> +static noinline int ethtool_get_sset_info(struct net_device *dev, >> + void __user *useraddr) >> +{ > [...] >> + /* calculate size of return buffer */ >> + for (i = 0; i< 64; i++) >> + if (sset_mask& (1ULL<< i)) >> + n_bits++; > [...] > > We have a function for this: > > n_bits = hweight64(sset_mask); Agreed. I've attached a follow-up patch, which should enable my/Jeff's kernel patch to be applied, followed by this one. Signed-off-by: Jeff Garzik Signed-off-by: David S. Miller commit 723b2f57ad83ee7087acf9a95e8e289414b1f521 Author: Jeff Garzik Date: Wed Mar 3 22:51:50 2010 +0000 ethtool: Add direct access to ops->get_sset_count This patch is an alternative approach for accessing string counts, vs. the drvinfo indirect approach. This way the drvinfo space doesn't run out, and we don't break ABI later. Signed-off-by: Jeff Garzik Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4b79a1aedcb9dd6e3f27b970dcb553aefcd97254 Author: David Brown Date: Fri Mar 5 09:12:34 2010 +0000 net: smc91x: Support Qualcomm MSM development boards. Signed-off-by: David Brown Signed-off-by: Daniel Walker Acked-by: Nicolas Pitre Signed-off-by: David S. Miller commit a3a858ff18a72a8d388e31ab0d98f7e944841a62 Author: Zhu Yi Date: Thu Mar 4 18:01:47 2010 +0000 net: backlog functions rename sk_add_backlog -> __sk_add_backlog sk_add_backlog_limited -> sk_add_backlog Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 2499849ee8f513e795b9f2c19a42d6356e4943a4 Author: Zhu Yi Date: Thu Mar 4 18:01:46 2010 +0000 x25: use limited socket backlog Make x25 adapt to the limited socket backlog change. Cc: Andrew Hendry Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 53eecb1be5ae499d399d2923933937a9ea1a284f Author: Zhu Yi Date: Thu Mar 4 18:01:45 2010 +0000 tipc: use limited socket backlog Make tipc adapt to the limited socket backlog change. Cc: Jon Maloy Cc: Allan Stephens Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Acked-by: Allan Stephens Signed-off-by: David S. Miller commit 50b1a782f845140f4138f14a1ce8a4a6dd0cc82f Author: Zhu Yi Date: Thu Mar 4 18:01:44 2010 +0000 sctp: use limited socket backlog Make sctp adapt to the limited socket backlog change. Cc: Vlad Yasevich Cc: Sridhar Samudrala Signed-off-by: Zhu Yi Signed-off-by: David S. Miller commit 79545b681961d7001c1f4c3eb9ffb87bed4485db Author: Zhu Yi Date: Thu Mar 4 18:01:43 2010 +0000 llc: use limited socket backlog Make llc adapt to the limited socket backlog change. Cc: Arnaldo Carvalho de Melo Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 55349790d7cbf0d381873a7ece1dcafcffd4aaa9 Author: Zhu Yi Date: Thu Mar 4 18:01:42 2010 +0000 udp: use limited socket backlog Make udp adapt to the limited socket backlog change. Cc: "David S. Miller" Cc: Alexey Kuznetsov Cc: "Pekka Savola (ipv6)" Cc: Patrick McHardy Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 6b03a53a5ab7ccf2d5d69f96cf1c739c4d2a8fb9 Author: Zhu Yi Date: Thu Mar 4 18:01:41 2010 +0000 tcp: use limited socket backlog Make tcp adapt to the limited socket backlog change. Cc: "David S. Miller" Cc: Alexey Kuznetsov Cc: "Pekka Savola (ipv6)" Cc: Patrick McHardy Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 8eae939f1400326b06d0c9afe53d2a484a326871 Author: Zhu Yi Date: Thu Mar 4 18:01:40 2010 +0000 net: add limit for socket backlog We got system OOM while running some UDP netperf testing on the loopback device. The case is multiple senders sent stream UDP packets to a single receiver via loopback on local host. Of course, the receiver is not able to handle all the packets in time. But we surprisingly found that these packets were not discarded due to the receiver's sk->sk_rcvbuf limit. Instead, they are kept queuing to sk->sk_backlog and finally ate up all the memory. We believe this is a secure hole that a none privileged user can crash the system. The root cause for this problem is, when the receiver is doing __release_sock() (i.e. after userspace recv, kernel udp_recvmsg -> skb_free_datagram_locked -> release_sock), it moves skbs from backlog to sk_receive_queue with the softirq enabled. In the above case, multiple busy senders will almost make it an endless loop. The skbs in the backlog end up eat all the system memory. The issue is not only for UDP. Any protocols using socket backlog is potentially affected. The patch adds limit for socket backlog so that the backlog size cannot be expanded endlessly. Reported-by: Alex Shi Cc: David Miller Cc: Arnaldo Carvalho de Melo Cc: Alexey Kuznetsov Cc: Patrick McHardy Cc: Vlad Yasevich Cc: Sridhar Samudrala Cc: Jon Maloy Cc: Allan Stephens Cc: Andrew Hendry Signed-off-by: Zhu Yi Signed-off-by: Eric Dumazet Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit a11106544f33c104706ae42d27219a409b67478e Author: Scott Wood Date: Thu Feb 25 18:09:45 2010 -0600 powerpc/perf: e500 support This implements perf_event support for the Freescale embedded performance monitor, based on the existing perf_event.c that supports server/classic chips. Some limitations: - Performance monitor interrupts are regular EE interrupts, and thus you can't profile places with interrupts disabled. We may want to implement soft IRQ-disabling, with perfmon interrupts exempted and treated as NMIs. - When trying to schedule multiple event groups at once, and using restricted events, situations could arise where scheduling fails even though it would be possible. Consider three groups, each with two events. One group has restricted events, the others don't. The two non-restricted groups are scheduled, then one is removed, which happens to occupy the two counters that can't do restricted events. The remaining non-restricted group will not be moved to the non-restricted-capable counters to make room if the restricted group tries to be scheduled. Signed-off-by: Scott Wood Acked-by: Paul Mackerras Signed-off-by: Kumar Gala commit facf92695dcf40836973ce09b7f62d3cc3a89152 Author: Mark Brown Date: Mon Mar 1 19:57:59 2010 +0000 ASoC: Fix S3C64xx IIS driver for Samsung header reorg The reorgs of the Samsung headers have moved the GPIO bank definitions from plat/ to mach/ - the IIS driver needs to be updated to take care of this. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 8997de30adf5d11e9c807f1d89a894ffed60616b Author: Ben Dooks Date: Thu Mar 4 23:14:44 2010 +0000 ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support Commit 58bac7b8ded70c39bcd5f7037091051c277618aa failed to move the two PLL files s3c2440-pll-12000000.c and s3c2440-pll-16934400.c, so place these in arch/arm/mach-s3c2440 to fix this commit up. As a note, these are not built by the default configuration and thus the failure to move wasn't spotted until much later. Signed-off-by: Ben Dooks commit 9d6df3fdfc470c313b7ea13dbe8a63fb21ab7365 Author: Scott Wood Date: Thu Feb 25 18:04:33 2010 -0600 powerpc/perf: Build callchain code regardless of hardware event support. It's also useful for software events, as well as future support for other types of hardware counters. Signed-off-by: Scott Wood Acked-by: Paul Mackerras Signed-off-by: Kumar Gala commit 653c60f37695d054e24b84102bb2426dd2840b8c Author: Andrea Gelmini Date: Sat Feb 27 17:51:25 2010 +0100 powerpc/cpm2: Checkpatch cleanup arch/powerpc/sysdev/cpm2_pic.h:6: ERROR: "(foo*)" should be "(foo *)" Signed-off-by: Andrea Gelmini Signed-off-by: Kumar Gala commit 948e78c3fc9c799b3f9b6c683b83c665942e6bbe Author: Martyn Welch Date: Mon Mar 1 14:41:59 2010 +0000 powerpc/86xx: Renaming following split of GE Fanuc joint venture This patch renames GE Fanuc boards following the split-up of the GE Fanuc joint venture. These boards are now made by GE Intelligent platorms. Signed-off-by: Martyn Welch Signed-off-by: Kumar Gala commit 6f3d395a5c77e6ccddd59a5221e1354b22c29531 Author: Anton Vorontsov Date: Thu Feb 18 16:57:27 2010 +0300 powerpc/86xx: Convert gef_pic_lock to raw_spinlock Interrupt controllers' hooks are executed in the atomic context, so they are not permitted to sleep (with RT kernels non-raw spinlocks are sleepable). So, gef_pic_lock has to be a real (non-sleepable) spinlock. Signed-off-by: Anton Vorontsov Acked-by: Thomas Gleixner Signed-off-by: Kumar Gala commit 43a5a01bcc5b53c67878f043b4a1b31eaa87a360 Author: Anton Vorontsov Date: Thu Feb 18 16:43:12 2010 +0300 powerpc/qe: Convert qe_ic_lock to raw_spinlock Interrupt controllers' hooks are executed in the atomic context, so they are not permitted to sleep (with RT kernels non-raw spinlocks are sleepable). So, qe_ic_lock has to be a real (non-sleepable) spinlock. Signed-off-by: Anton Vorontsov Acked-by: Thomas Gleixner Signed-off-by: Kumar Gala commit 0e5d359cca2d685311c4eaeb570f2e7e7915da31 Author: Anton Vorontsov Date: Thu Feb 18 16:57:38 2010 +0300 powerpc/82xx: Convert pci_pic_lock to raw_spinlock Interrupt controllers' hooks are executed in the atomic context, so they are not permitted to sleep (with RT kernels non-raw spinlocks are sleepable). So, pci_pic_lock has to be a real (non-sleepable) spinlock. Signed-off-by: Anton Vorontsov Acked-by: Thomas Gleixner Signed-off-by: Kumar Gala commit 7e026f72cf05137e0b52b7aa5420e95a76bd3195 Author: Anton Vorontsov Date: Thu Feb 18 16:45:12 2010 +0300 powerpc/85xx: Convert socrates_fpga_pic_lock to raw_spinlock Interrupt controllers' hooks are executed in the atomic context, so they are not permitted to sleep (with RT kernels non-raw spinlocks are sleepable). So, socrates_fpga_pic_lock has to be a real (non-sleepable) spinlock. Signed-off-by: Anton Vorontsov Acked-by: Thomas Gleixner Signed-off-by: Kumar Gala commit 12c3400a84742f8bb0e4edc822e9ccba58781e0c Author: Jiri Pirko Date: Thu Mar 4 03:32:16 2010 -0800 rndis_wlan: correct multicast_list handling V3 My previous patch (655ffee284dfcf9a24ac0343f3e5ee6db85b85c5) added locking in a bad way. Because rndis_set_oid can sleep, there is need to prepare multicast addresses into local buffer under netif_addr_lock first, then call rndis_set_oid outside. This caused reorganizing of the whole function. Signed-off-by: Jiri Pirko Reported-by: Jussi Kivilinna Signed-off-by: David S. Miller commit 3e75c3b0ca669ce675c52ad36a7998f55f16757f Merge: cf4fee5 29044ad Author: Ingo Molnar Date: Thu Mar 4 12:27:39 2010 +0100 Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent commit cf4fee50282312528e1f8adf73b1831d1d6ae389 Author: Tom Zanussi Date: Wed Mar 3 01:04:33 2010 -0600 perf trace: Don't use pager if scripting It's useful for paging through raw traces, but just gets in the way when scripting. Signed-off-by: Tom Zanussi Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org LKML-Reference: <1267599873-8193-3-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit 10c95f4f41889daaa8130e0bd12209825dbe8d39 Author: Tom Zanussi Date: Wed Mar 3 01:04:32 2010 -0600 perf trace/scripting: Remove extraneous header read perf_header__read() is already done in perf_session__open(), so remove it from the script gen case. Signed-off-by: Tom Zanussi Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org LKML-Reference: <1267599873-8193-2-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit da7196e1f986c846ffa8b2ec385223fad38e8518 Author: Will Deacon Date: Wed Mar 3 11:47:58 2010 +0000 perf, ARM: Modify kuser rmb() call to compile for Thumb-2 The Thumb-2 instruction set does not provide an encoding for sub pc, r0, #95 as present in the rmb() definition used by perf. This results in compilation failure when using a compiler targetting an instruction set other than ARM. This patch redefines rmb() for ARM by casting the address of the kuser helper to a function pointer, therefore getting the compiler to take care of making the call. Patch taken against tip/master. Signed-off-by: Will Deacon Cc: Russell King - ARM Linux Cc: Jamie Iles Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: <1267616878-2154-1-git-send-email-will.deacon@arm.com> Signed-off-by: Ingo Molnar commit 54dbf96c921513bf98484a20ef366d51944a4c4d Author: Paul E. McKenney Date: Wed Mar 3 07:46:57 2010 -0800 rcu: Suppress RCU lockdep warnings during early boot RCU is used during very early boot, before RCU and lockdep have been initialized. So make the underlying primitives (rcu_read_lock_held(), rcu_read_lock_bh_held(), rcu_read_lock_sched_held(), and rcu_dereference_check()) check for early boot via the rcu_scheduler_active flag. This will suppress false positives. Also introduce a debug_lockdep_rcu_enabled() static inline helper function, which tags the CONTINUE_PROVE_RCU case as likely(), as suggested by Ingo Molnar. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267631219-8713-2-git-send-email-paulmck@linux.vnet.ibm.com> [ v2: removed incomplete debug_lockdep_rcu_update() bits ] Signed-off-by: Ingo Molnar commit 8d53dd546f36073e0d29b0cfc24c665db301e3e7 Author: Paul E. McKenney Date: Wed Mar 3 17:50:18 2010 -0800 rcu, ftrace: Fix RCU lockdep splat in ftrace_perf_buf_prepare() Change the pair of rcu_dereference() calls in ftrace_perf_buf_prepare() to rcu_dereference_sched(). Signed-off-by: Paul E. McKenney Acked-by: Frederic Weisbecker Cc: Steven Rostedt Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com Cc: Frederic Weisbecker LKML-Reference: <1267667418-32233-3-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 99ee4ca746dda71326db7645463b4075ac1d665c Author: Paul E. McKenney Date: Wed Mar 3 17:50:17 2010 -0800 rcu: Suppress __mpol_dup() false positive from RCU lockdep Common code is used during task creation and after the task has started running. RCU protection is not needed during task creation because no other CPU has access to the under-construction task. Provide the RCU protection anyway to suppress the false positive, as there does not appear to be a good way for the common code to recognize that the task is only accessible to the CPU creating it. Signed-off-by: Paul E. McKenney Cc: Paul Menage Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267667418-32233-2-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit e6033e3b307fcfae08408e0673266db38392bda4 Author: Paul E. McKenney Date: Wed Mar 3 17:50:16 2010 -0800 rcu: Make rcu_read_lock_sched_held() handle !PREEMPT The rcu_read_lock_sched_held() needs to unconditionally return the value "1" in a !PREEMPT kernel, because under !PREEMPT, -all- kernel code is implicitly preempt-disabled. This patch makes this happen. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267667418-32233-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit cc5b83a9f884fe8722a275069a5a6fde39988455 Author: Paul E. McKenney Date: Wed Mar 3 07:46:59 2010 -0800 rcu: Add control variables to lockdep_rcu_dereference() diagnostics Add the values of rcu_scheduler_active() and debug_locks() to the lockdep_rcu_dereference() output to help diagnose RCU lockdep splats that occur shortly after the scheduler starts. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267631219-8713-4-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 5ed42b8113667c06a6ff2c72717395b5044d30a1 Author: Paul E. McKenney Date: Wed Mar 3 07:46:58 2010 -0800 rcu, cgroup: Relax the check in task_subsys_state() as early boot is now handled by lockdep-RCU This patch removes the check for !rcu_scheduler_active because this check has been incorporated into rcu_dereference_check(). Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267631219-8713-3-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit e02c4fd3142dfb9412531bbfabd510a2a7c6ea46 Merge: ae1f303 ac91d85 Author: Ingo Molnar Date: Thu Mar 4 11:51:29 2010 +0100 Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent commit 4f16d4e0c9a4b20d9f0db365587b96d6001efd7d Merge: 1e259e0 6630125 Author: Ingo Molnar Date: Thu Mar 4 11:47:50 2010 +0100 Merge branch 'perf/core' into perf/urgent Merge reason: Switch from pre-merge topical split to the post-merge urgent track Signed-off-by: Ingo Molnar commit db1466b3e1bd1727375cdbfcbea4bcce2f860f61 Author: Paul E. McKenney Date: Wed Mar 3 07:46:56 2010 -0800 rcu: Use wrapper function instead of exporting tasklist_lock Lockdep-RCU commit d11c563d exported tasklist_lock, which is not a good thing. This patch instead exports a function that uses lockdep to check whether tasklist_lock is held. Suggested-by: Christoph Hellwig Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com Cc: Christoph Hellwig LKML-Reference: <1267631219-8713-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 0e064caf6402d1d67db4233d26beec88ca212919 Merge: 90a6501 f409adf c13f3d3 Author: Ingo Molnar Date: Thu Mar 4 11:45:25 2010 +0100 Merge branches 'core/futexes' and 'core/iommu' into core/urgent Merge reason: Switch from topical split to the stabilization track Signed-off-by: Ingo Molnar commit 4c32531324b83672f100692354b680625bcd7fba Author: David S. Miller Date: Thu Mar 4 00:42:30 2010 -0800 MAINTAINERS: Add netdev to bridge entry. Noticed by Ingo Molnar. Signed-off-by: David S. Miller commit a6f018e324ba91d0464cca6895447c2b89e6d578 Author: Divy Le Ray Date: Wed Mar 3 09:49:47 2010 +0000 cxgb3: fix hot plug removal crash queue restart tasklets need to be stopped after napi handlers are stopped since the latter can restart them. So stop them after stopping napi. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit 0eddba525cf4c3a4aab9feaf36b12b465290d4a7 Author: Anton Vorontsov Date: Wed Mar 3 08:18:58 2010 +0000 gianfar: Fix TX ring processing on SMP machines Starting with commit a3bc1f11e9b867a4f49505 ("gianfar: Revive SKB recycling") gianfar driver sooner or later stops transmitting any packets on SMP machines. start_xmit() prepares new skb for transmitting, generally it does three things: 1. sets up all BDs (marks them ready to send), except the first one. 2. stores skb into tx_queue->tx_skbuff so that clean_tx_ring() would cleanup it later. 3. sets up the first BD, i.e. marks it ready. Here is what clean_tx_ring() does: 1. reads skbs from tx_queue->tx_skbuff 2. checks if the *last* BD is ready. If it's still ready [to send] then it it isn't transmitted, so clean_tx_ring() returns. Otherwise it actually cleanups BDs. All is OK. Now, if there is just one BD, code flow: - start_xmit(): stores skb into tx_skbuff. Note that the first BD (which is also the last one) isn't marked as ready, yet. - clean_tx_ring(): sees that skb is not null, *and* its lstatus says that it is NOT ready (like if BD was sent), so it cleans it up (bad!) - start_xmit(): marks BD as ready [to send], but it's too late. We can fix this simply by reordering lstatus/tx_skbuff writes. Reported-by: Martyn Welch Bisected-by: Paul Gortmaker Signed-off-by: Anton Vorontsov Tested-by: Paul Gortmaker Tested-by: Martyn Welch Cc: Sandeep Gopalpet Cc: Stable [2.6.33] Signed-off-by: David S. Miller commit 4c020a961a812ffae9846b917304cea504c3a733 Author: David Dillow Date: Wed Mar 3 16:33:10 2010 +0000 r8169: use correct barrier between cacheable and non-cacheable memory r8169 needs certain writes to be visible to other CPUs or the NIC before touching the hardware, but was using smp_wmb() which is only required to order cacheable memory access. Switch to wmb() which is required to order both cacheable and non-cacheable memory. Noticed by Catalin Marinas and Paul Mackerras. Signed-off-by: David Dillow Signed-off-by: David S. Miller commit d0021b252eaf65ca07ed14f0d66425dd9ccab9a6 Author: Neil Horman Date: Wed Mar 3 08:31:23 2010 +0000 tipc: Fix oops on send prior to entering networked mode (v3) Fix TIPC to disallow sending to remote addresses prior to entering NET_MODE user programs can oops the kernel by sending datagrams via AF_TIPC prior to entering networked mode. The following backtrace has been observed: ID: 13459 TASK: ffff810014640040 CPU: 0 COMMAND: "tipc-client" [exception RIP: tipc_node_select_next_hop+90] RIP: ffffffff8869d3c3 RSP: ffff81002d9a5ab8 RFLAGS: 00010202 RAX: 0000000000000001 RBX: 0000000000000001 RCX: 0000000000000001 RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000001001001 RBP: 0000000001001001 R8: 0074736575716552 R9: 0000000000000000 R10: ffff81003fbd0680 R11: 00000000000000c8 R12: 0000000000000008 R13: 0000000000000001 R14: 0000000000000001 R15: ffff810015c6ca00 ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018 RIP: 0000003cbd8d49a3 RSP: 00007fffc84e0be8 RFLAGS: 00010206 RAX: 000000000000002c RBX: ffffffff8005d116 RCX: 0000000000000000 RDX: 0000000000000008 RSI: 00007fffc84e0c00 RDI: 0000000000000003 RBP: 0000000000000000 R8: 00007fffc84e0c10 R9: 0000000000000010 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007fffc84e0d10 R14: 0000000000000000 R15: 00007fffc84e0c30 ORIG_RAX: 000000000000002c CS: 0033 SS: 002b What happens is that, when the tipc module in inserted it enters a standalone node mode in which communication to its own address is allowed <0.0.0> but not to other addresses, since the appropriate data structures have not been allocated yet (specifically the tipc_net pointer). There is nothing stopping a client from trying to send such a message however, and if that happens, we attempt to dereference tipc_net.zones while the pointer is still NULL, and explode. The fix is pretty straightforward. Since these oopses all arise from the dereference of global pointers prior to their assignment to allocated values, and since these allocations are small (about 2k total), lets convert these pointers to static arrays of the appropriate size. All the accesses to these bits consider 0/NULL to be a non match when searching, so all the lookups still work properly, and there is no longer a chance of a bad dererence anywhere. As a bonus, this lets us eliminate the setup/teardown routines for those pointers, and elimnates the need to preform any locking around them to prevent access while their being allocated/freed. I've updated the tipc_net structure to behave this way to fix the exact reported problem, and also fixed up the tipc_bearers and media_list arrays to fix an obvious simmilar problem that arises from issuing tipc-config commands to manipulate bearers/links prior to entering networked mode I've tested this for a few hours by running the sanity tests and stress test with the tipcutils suite, and nothing has fallen over. There have been a few lockdep warnings, but those were there before, and can be addressed later, as they didn't actually result in any deadlock. Signed-off-by: Neil Horman CC: Allan Stephens CC: David S. Miller CC: tipc-discussion@lists.sourceforge.net bearer.c | 37 ++++++------------------------------- bearer.h | 2 +- net.c | 25 ++++--------------------- 3 files changed, 11 insertions(+), 53 deletions(-) Signed-off-by: David S. Miller commit 6d55cb91a0020ac0d78edcad61efd6c8cf5785a3 Author: Timo Teräs Date: Wed Mar 3 04:01:13 2010 +0000 gre: fix hard header destination address checking ipgre_header() can be called with zero daddr when the gre device is configured as multipoint tunnel and still has the NOARP flag set (which is typically cleared by the userspace arp daemon). If the NOARP packets are not dropped, ipgre_tunnel_xmit() will take rt->rt_gateway (= NBMA IP) and use that for route look up (and may lead to bogus xfrm acquires). The multicast address check is removed as sending to multicast group should be ok. In fact, if gre device has a multicast address as destination ipgre_header is always called with multicast address. Signed-off-by: Timo Teras Signed-off-by: David S. Miller commit c839d30a41dd92eb32d7fcfa2b4e99042fc64bf2 Author: Mike Galbraith Date: Wed Mar 3 04:46:50 2010 +0000 net: add scheduler sync hint to tcp_prequeue(). Decreases the odds wakee will suffer from frequent cache misses. Signed-off-by: Mike Galbraith Signed-off-by: David S. Miller commit 8f37ada5b5f6bfb4d251a7f510f249cb855b77b3 Author: stephen hemminger Date: Wed Mar 3 08:19:59 2010 +0000 IPv6: fix race between cleanup and add/delete address This solves a potential race problem during the cleanup process. The issue is that addrconf_ifdown() needs to traverse address list, but then drop lock to call the notifier. The version in -next could get confused if add/delete happened during this window. Original code (2.6.32 and earlier) was okay because all addresses were always deleted. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 84e8b803f1e16f3a2b8b80f80a63fa2f2f8a9be6 Author: stephen hemminger Date: Tue Mar 2 13:32:46 2010 +0000 IPv6: addrconf notify when address is unavailable My recent change in net-next to retain permanent addresses caused regression. Device refcount would not go to zero when device was unregistered because left over anycast reference would hold ipv6 dev reference which would hold device references... The correct procedure is to call notify chain when address is no longer available for use. When interface comes back DAD timer will notify back that address is available. Also, link local addresses should be purged when interface is brought down. The address might be changed. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 5b2a19539c5f59c5a038d213ede723f0245d97cf Author: stephen hemminger Date: Tue Mar 2 13:32:45 2010 +0000 IPv6: addrconf timer race The Router Solicitation timer races with device state changes because it doesn't lock the device. Use local variable to avoid one repeated dereference. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 122e4519cd5c224d4b8e681d368132b643e28f60 Author: stephen hemminger Date: Tue Mar 2 13:32:44 2010 +0000 IPv6: addrconf dad timer unnecessary bh_disable Timer code runs in bottom half, so there is no need for using _bh form of locking. Also check if device is not ready to avoid race with address that is no longer active. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit e5c1a0aa00ce94ab0cd669bb290c3ae4657242a3 Merge: 1cd4efd 31f66be Author: David S. Miller Date: Wed Mar 3 22:42:54 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 31f66be44a657a14e0ab3536e4877c66c9ce031e Author: Helmut Schaa Date: Wed Mar 3 17:42:55 2010 +0100 rt2x00: Export rt2x00soc_probe from rt2x00soc Export rt2x00soc_probe from rt2x00soc as it is used in rt2800pci. Otherwise loading rt2800pci gives "rt2800pci: Unknown symbol rt2x00soc_probe". Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 4fa004373133ece3d9b1c0a7e243b0e53760b165 Author: Sujith Date: Mon Mar 1 14:42:57 2010 +0530 mac80211: Fix HT rate control configuration Handling HT configuration changes involved setting the channel with the new HT parameters and then issuing a rate_update() notification to the driver. This behavior changed after the off-channel changes. Now, the channel is not updated with the new HT params in enable_ht() - instead, it is now done when the scan work terminates. This results in the driver depending on stale information, defaulting to non-HT mode always. Fix this by passing the new channel type to the driver. Cc: stable@kernel.org Signed-off-by: Sujith Signed-off-by: John W. Linville commit 1cd4efddc4512ccbd9fe317f688f361605ca0c88 Author: Randy Dunlap Date: Wed Mar 3 01:23:22 2010 -0800 bridge: depends on INET br_multicast calls ip_send_check(), so it should depend on INET. built-in: br_multicast.c:(.text+0x88cf4): undefined reference to `ip_send_check' or modular: ERROR: "ip_send_check" [net/bridge/bridge.ko] undefined! Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 4d63cb4d8638fdf2e3bf874936335a08e3b5d8fe Author: Vladislav Zolotarov Date: Wed Mar 3 01:09:21 2010 -0800 bnx2x: Removed FW 5.2.7 Removed FW 5.2.7. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 4d27b87785a743fdae653d395a3a4e763269c53c Author: Dan Carpenter Date: Tue Mar 2 21:07:24 2010 +0000 davinci_emac: off by one This off by one error was found by smatch. drivers/net/davinci_emac.c +2390 emac_dev_open(13) error: buffer overflow 'priv->mac_addr' 6 <= 6 Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit bf829370a8d664d87a61697c8a0d6d780c336aa4 Author: Dan Carpenter Date: Tue Mar 2 22:22:41 2010 +0000 cassini: fix off by one There are only 6 link_modes. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit d4612cb86ed8db8956b6b19435f8a30de6c67ffe Author: Marcel Holtmann Date: Tue Mar 2 15:48:23 2010 +0000 Bluetooth: Use single_open() for inquiry cache within debugfs The inquiry cache information in debugfs should be using seq_file support and not allocating memory on the stack for the string. Since the usage of these information is really seldom, using single_open() for it is good enough. Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 1162563f82b434e3099c9e6c1bbdba846d792f0d Author: Jiri Pirko Date: Tue Mar 2 20:40:01 2010 +0000 af_packet: move strict addr_len check right before dev_[mc/unicast]_[add/del] My previous patch 914c8ad2d18b62ad1420f518c0cab0b0b90ab308 incorrectly changed the length check in packet_mc_add to be more strict. The problem is that userspace is not filling this field (and it stays zeroed) in case of setting PACKET_MR_PROMISC or PACKET_MR_ALLMULTI. So move the strict check to the point in path where the addr_len must be set correctly. Signed-off-by: Jiri Pirko Reported-by: Pavel Roskin Signed-off-by: David S. Miller commit 9fe969345b10931319b3f1e7034fbdeb786de234 Author: Sarveshwar Bandi Date: Tue Mar 2 22:37:28 2010 +0000 be2net: download NCSI section during firmware update Adding code to update NCSI section while updating firmware on the controller. Signed-off-by: Sarveshwar Bandi Signed-off-by: David S. Miller commit 48a29516e8b0b8cd59f5afec90a14f49dd9cf967 Author: Dan Carpenter Date: Tue Mar 2 22:46:10 2010 +0000 cpmac: use after free The original code dereferenced "cpmac_mii" after calling "mdiobus_free(cpmac_mii);" Signed-off-by: Dan Carpenter Reviewed-by: Jiri Pirko Signed-off-by: David S. Miller commit 87c1e12b5eeb7b30b4b41291bef8e0b41fc3dde9 Author: Herbert Xu Date: Tue Mar 2 02:51:56 2010 +0000 ipsec: Fix bogus bundle flowi When I merged the bundle creation code, I introduced a bogus flowi value in the bundle. Instead of getting from the caller, it was instead set to the flow in the route object, which is totally different. The end result is that the bundles we created never match, and we instead end up with an ever growing bundle list. Thanks to Jamal for find this problem. Reported-by: Jamal Hadi Salim Signed-off-by: Herbert Xu Acked-by: Steffen Klassert Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 29044ad1509ecc229f1d5a31aeed7a8dc61a71c4 Author: Frederic Weisbecker Date: Wed Mar 3 02:25:22 2010 +0100 x86/stacktrace: Don't dereference bad frame pointers Callers of a stacktrace might pass bad frame pointers. Those are usually checked for safety in stack walking helpers before any dereferencing, but this is not the case when we need to go through one more frame pointer that backlinks the irq stack to the previous one, as we don't have any reliable address boudaries to compare this frame pointer against. This raises crashes when we record callchains for ftrace events with perf because we don't use the right helpers to capture registers there. We get wrong frame pointers as we call task_pt_regs() even on kernel threads, which is a wrong thing as it gives us the initial state of any kernel threads freshly created. This is even not what we want for user tasks. What we want is a hot snapshot of registers when the ftrace event triggers, not the state before a task entered the kernel. This requires more thoughts to do it correctly though. So first put a guardian to ensure the given frame pointer can be dereferenced to avoid crashes. We'll think about how to fix the callers in a subsequent patch. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Thomas Gleixner Cc: H. Peter Anvin Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Steven Rostedt Cc: 2.6.33.x Cc: Arnaldo Carvalho de Melo commit ac91d85456372a90af5b85eb6620fd2efb1e431b Author: Lai Jiangshan Date: Tue Mar 2 17:54:50 2010 +0800 tracing: Fix warning in s_next of trace file ops This warning in s_next() can be triggered by lseek(): [] ? s_next+0x77/0x80 [] warn_slowpath_common+0x81/0xa0 [] ? s_next+0x77/0x80 [] warn_slowpath_null+0x1a/0x20 [] s_next+0x77/0x80 [] traverse+0x117/0x200 [] seq_lseek+0xa3/0x120 [] ? seq_lseek+0x0/0x120 [] vfs_llseek+0x41/0x50 [] sys_llseek+0x66/0xa0 [] sysenter_do_call+0x12/0x26 The iterator "leftover" variable is zeroed in the opening of the trace file. But lseek can call s_start() which will call s_next() without reseting the "leftover" variable back to zero, which might trigger the WARN_ON_ONCE(iter->leftover) that is in s_next(). Cc: stable@kernel.org Signed-off-by: Lai Jiangshan LKML-Reference: <4B8CE06A.9090207@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 882d01f96bc1909455696aae6eb7ce4df3e908c8 Merge: 64ed28a d608c73 Author: Russell King Date: Tue Mar 2 23:40:15 2010 +0000 Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable Conflicts: arch/arm/Kconfig arch/arm/Makefile commit 64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 Merge: b93a4af 17ccb83 Author: Russell King Date: Tue Mar 2 23:31:07 2010 +0000 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable Conflicts: arch/arm/Kconfig commit b93a4afcff7be859e30cad2a305731516057d6cf Merge: 62c132a 9b1489e Author: Russell King Date: Tue Mar 2 23:29:32 2010 +0000 Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable Conflicts: arch/arm/Makefile commit b08dfd0435333818a03b38867c556ebcbb3abc02 Author: Johannes Berg Date: Fri Jan 29 11:54:56 2010 -0800 iwlwifi: load firmware asynchronously before mac80211 registration At the wireless summit in Portland we discussed a way of loading firmware asynchronously from ->probe() before registration to mac80211, in order to register with the wireless subsystems with complete information in cases where firmware is required to know parameters. This is not yet the case in iwlwifi, but for some new features we're working on it will be the case since those will only be supported by new firmware images. Hence, to start with, convert iwlwifi to load firmware asynchronously from probe, unbinding the device when firmware loading fails, and only registering with the wireless subsystems after firmware has been loaded successfully. Future patches will hook into this to register the new firmware capabilities, depending on the firmware API version. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 535765179fd4e8af26b69d2240d7ec33702a370a Author: Johannes Berg Date: Wed Dec 23 13:15:30 2009 +0100 ar9170: load firmware asynchronously This converts ar9170 to load firmware asynchronously out of ->probe() and only register with mac80211 when all firmware has been loaded successfully. If, on the other hand, any firmware fails to load, it will now unbind from the device. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 6e93d7195e75741e9ebe23ca5591977d0b39ecc0 Author: Helmut Schaa Date: Tue Mar 2 16:34:49 2010 +0100 rt2x00: fix rt2800pci compilation with SoC Compiling rt2800pci with CONFIG_RT2800PCI_SOC fails with "... rt2880pci.c: error: incompatible type for argument 2 of 'rt2x00soc_probe'". Fix this by using &rt2800pci_ops instead of rt2800pci_ops. Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 51b2853fd91a3c8fd9f3adc1549569d2c1dc2a2d Author: Bryan Polk Date: Mon Mar 1 12:23:28 2010 -0500 rt2x00: Add USB ID for CEIVA adapter to rt73usb This adds support for CEIVA USB wireless adapters to the rt73usb driver. Signed-off-by: Bryan Polk Acked-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 9c87ba6734422034fccb938da1039ed63da1395c Author: Jouni Malinen Date: Sun Feb 28 12:13:46 2010 +0200 mac80211: Fix reassociation processing (within ESS roaming) Commit e1dd33f60ced091114e4aacf141e0d03b88d3e13 changed cfg80211 to allow association commands while in associated state to enable support for roaming within an ESS. However, this was not enough to resolve all cases with mac80211 which needs some additional handling of the reassociation case to clear internal state with the BSS that was in use previously. This patch makes ieee80211_mgd_assoc() accept a valid reassociation command and clean the association state with the previous BSS. This fixes roaming between BSSes in an ESS when using wpa_supplicant with -Dnl80211. Signed-off-by: Jouni Malinen Cc: stable@kernel.org Signed-off-by: John W. Linville commit a9f042cbe5284f34ccff15f3084477e11b39b17b Author: Ming Lei Date: Sun Feb 28 00:56:24 2010 +0800 ath9k: fix lockdep warning when unloading module Since txq->axq_lock may be hold in softirq context, it must be acquired with spin_lock_bh() instead of spin_lock() if softieq is enabled. The patch fixes the lockdep warning below when unloading ath9k modules. ================================= [ INFO: inconsistent lock state ] 2.6.33-wl #12 --------------------------------- inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage. rmmod/3642 [HC0[0]:SC0[0]:HE1:SE1] takes: (&(&txq->axq_lock)->rlock){+.?...}, at: [] ath_tx_node_cleanup+0x62/0x180 [ath9k] {IN-SOFTIRQ-W} state was registered at: [] __lock_acquire+0x2f6/0xd35 [] lock_acquire+0xcd/0xf1 [] _raw_spin_lock_bh+0x3b/0x6e [] spin_lock_bh+0xe/0x10 [ath9k] [] ath_tx_tasklet+0xcd/0x391 [ath9k] [] ath9k_tasklet+0x70/0xc8 [ath9k] [] tasklet_action+0x8c/0xf4 [] __do_softirq+0xf8/0x1cd [] call_softirq+0x1c/0x30 [] do_softirq+0x4b/0xa3 [] irq_exit+0x4a/0x8c [] do_IRQ+0xac/0xc3 [] ret_from_intr+0x0/0x16 [] cpuidle_idle_call+0x9e/0xf8 [] cpu_idle+0x62/0x9d [] rest_init+0x7e/0x80 [] start_kernel+0x3e8/0x3f3 [] x86_64_start_reservations+0xa7/0xab [] x86_64_start_kernel+0xf8/0x107 irq event stamp: 42037 hardirqs last enabled at (42037): [] _raw_spin_unlock_irqrestore+0x47/0x56 hardirqs last disabled at (42036): [] _raw_spin_lock_irqsave+0x2b/0x88 softirqs last enabled at (42000): [] spin_unlock_bh+0xe/0x10 [ath9k] softirqs last disabled at (41998): [] _raw_spin_lock_bh+0x18/0x6e other info that might help us debug this: 4 locks held by rmmod/3642: #0: (rtnl_mutex){+.+.+.}, at: [] rtnl_lock+0x17/0x19 #1: (&wdev->mtx){+.+.+.}, at: [] cfg80211_netdev_notifier_call+0x28d/0x46d [cfg80211] #2: (&ifmgd->mtx){+.+.+.}, at: [] ieee80211_mgd_deauth+0x3f/0x17e [mac80211] #3: (&local->sta_mtx){+.+.+.}, at: [] sta_info_destroy_addr+0x2b/0x5e [mac80211] stack backtrace: Pid: 3642, comm: rmmod Not tainted 2.6.33-wl #12 Call Trace: [] valid_state+0x178/0x18b [] ? save_stack_trace+0x2f/0x4c [] ? check_usage_backwards+0x0/0x88 [] mark_lock+0x113/0x230 [] __lock_acquire+0x36a/0xd35 [] ? native_sched_clock+0x2d/0x5f [] ? ath_tx_node_cleanup+0x62/0x180 [ath9k] [] lock_acquire+0xcd/0xf1 [] ? ath_tx_node_cleanup+0x62/0x180 [ath9k] [] ? trace_hardirqs_off+0xd/0xf [] _raw_spin_lock+0x36/0x69 [] ? ath_tx_node_cleanup+0x62/0x180 [ath9k] [] ath_tx_node_cleanup+0x62/0x180 [ath9k] [] ? trace_hardirqs_on+0xd/0xf [] ath9k_sta_remove+0x22/0x26 [ath9k] [] __sta_info_destroy+0x1ad/0x38c [mac80211] [] sta_info_destroy_addr+0x3e/0x5e [mac80211] [] ieee80211_set_disassoc+0x175/0x180 [mac80211] [] ieee80211_mgd_deauth+0x58/0x17e [mac80211] [] ? __mutex_lock_common+0x37f/0x3a4 [] ? cfg80211_netdev_notifier_call+0x28d/0x46d [cfg80211] [] ieee80211_deauth+0x1e/0x20 [mac80211] [] __cfg80211_mlme_deauth+0x130/0x13f [cfg80211] [] ? cfg80211_netdev_notifier_call+0x28d/0x46d [cfg80211] [] ? trace_hardirqs_off+0xd/0xf [] __cfg80211_disconnect+0x111/0x189 [cfg80211] [] cfg80211_netdev_notifier_call+0x2ce/0x46d [cfg80211] [] notifier_call_chain+0x37/0x63 [] raw_notifier_call_chain+0x14/0x16 [] call_netdevice_notifiers+0x1b/0x1d [] dev_close+0x6a/0xa6 [] rollback_registered_many+0xb6/0x2f4 [] unregister_netdevice_many+0x1b/0x66 [] ieee80211_remove_interfaces+0xc5/0xd0 [mac80211] [] ieee80211_unregister_hw+0x47/0xe8 [mac80211] [] ath9k_deinit_device+0x7a/0x9b [ath9k] [] ath_pci_remove+0x38/0x76 [ath9k] [] pci_device_remove+0x2d/0x51 [] __device_release_driver+0x7b/0xd1 [] driver_detach+0x98/0xbe [] bus_remove_driver+0x94/0xb7 [] driver_unregister+0x6c/0x74 [] pci_unregister_driver+0x46/0xad [] ath_pci_exit+0x15/0x17 [ath9k] [] ath9k_exit+0xe/0x2f [ath9k] [] sys_delete_module+0x1c7/0x236 [] ? retint_swapgs+0x13/0x1b [] ? trace_hardirqs_on_caller+0x119/0x144 [] ? audit_syscall_entry+0x11e/0x14a [] system_call_fastpath+0x16/0x1b wlan1: deauthenticating from 00:23:cd:e1:f9:b2 by local choice (reason=3) PM: Removing info for No Bus:wlan1 cfg80211: Calling CRDA to update world regulatory domain PM: Removing info for No Bus:rfkill2 PM: Removing info for No Bus:phy1 ath9k 0000:16:00.0: PCI INT A disabled Signed-off-by: Ming Lei Signed-off-by: John W. Linville commit 86baf712295a00d664da8566186b67041c89b15b Author: Dan Carpenter Date: Sat Feb 27 09:12:34 2010 +0300 zd1211rw: fix potential array underflow The first chunk fixes a debugging assert to print a warning about array underflows. The second chunk corrects a potential array underflow. I also removed an assert in the second chunk because it can no longer happen. Signed-off-by: Dan Carpenter Acked-by: Benoit Papillault Signed-off-by: John W. Linville commit 3082a2b7b1af1b1508c1c3fa589566064f926f40 Author: Matthew Garrett Date: Tue Feb 16 16:36:25 2010 -0500 rfkill: Add support for KEY_RFKILL Add support for handling KEY_RFKILL in the rfkill input module. This simply toggles the state of all rfkill devices. The comment in rfkill.h is also updated to reflect that RFKILL_TYPE_ALL may be used inside the kernel. Signed-off-by: Matthew Garrett Acked-by: Marcel Holtmann Signed-off-by: John W. Linville commit 6510b8917948283005a125c8337d3312a8a0561c Author: Stanislaw Gruszka Date: Fri Feb 26 15:10:28 2010 +0100 airo: return from set_wep_key() when key length is zero Even if keylen == 0 is a bug and should not really happen, better avoid possibility of passing bad value to firmware. Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 6630125419ef37ff8781713c5e9d416f2a4ba357 Author: Arnaldo Carvalho de Melo Date: Tue Mar 2 15:25:38 2010 -0300 perf archive: Don't try to collect files without a build-id To avoid these error: [root@doppio ~]# perf archive tar: .build-id/00/00000000000000000000000000000000000000: Cannot stat: No such file or directory tar: .build-id/00/00000000000000000000000000000000000000: Cannot stat: No such file or directory tar: .build-id/00/00000000000000000000000000000000000000: Cannot stat: No such file or directory tar: .build-id/00/00000000000000000000000000000000000000: Cannot stat: No such file or directory tar: Exiting with failure status due to previous errors [root@doppio ~]# More work is needed to support archiving symtabs for binaries without a build-id, perhaps creating a perf.data UUID + adding build-ids for the binaries copied into the cache and then have this perf.data session UUID be a directory with symlinks to the by now calculated build-id of the files inside it. Or just do an extra pass and insert the calculated build-ids in the perf.data header. Reported-by: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Ingo Molnar commit b622d644c7d61a5cb95b74e7b143c263bed21f0a Author: Peter Zijlstra Date: Mon Feb 1 15:36:30 2010 +0100 perf_events, x86: Fixup fixed counter constraints Patch 1da53e0230 ("perf_events, x86: Improve x86 event scheduling") lost us one of the fixed purpose counters and then ed8777fc13 ("perf_events, x86: Fix event constraint masks") broke it even further. Widen the fixed event mask to event+umask and specify the full config for each of the 3 fixed purpose counters. Then let the init code fill out the placement for the GP regs based on the cpuid info. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: Signed-off-by: Ingo Molnar commit 320ebf09cbb6d01954c9a060266aa8e0d27f4638 Author: Peter Zijlstra Date: Tue Mar 2 12:35:37 2010 +0100 perf, x86: Restrict the ANY flag The ANY flag can show SMT data of another task (like 'top'), so we want to disable it when system-wide profiling is disabled. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 14be1f7454ea96ee614467a49cf018a1a383b189 Author: Dimitri Sivanich Date: Mon Mar 1 11:48:15 2010 -0600 x86: Fix sched_clock_cpu for systems with unsynchronized TSC On UV systems, the TSC is not synchronized across blades. The sched_clock_cpu() function is returning values that can go backwards (I've seen as much as 8 seconds) when switching between cpus. As each cpu comes up, early_init_intel() will currently set the sched_clock_stable flag true. When mark_tsc_unstable() runs, it clears the flag, but this only occurs once (the first time a cpu comes up whose TSC is not synchronized with cpu 0). After this, early_init_intel() will set the flag again as the next cpu comes up. Only set sched_clock_stable if tsc has not been marked unstable. Signed-off-by: Dimitri Sivanich Acked-by: Venkatesh Pallipadi Acked-by: Peter Zijlstra LKML-Reference: <20100301174815.GC8224@sgi.com> Signed-off-by: Ingo Molnar commit ad6759fbf35d104dbf573cd6f4c6784ad6823f7e Author: john stultz Date: Mon Mar 1 12:34:43 2010 -0800 timekeeping: Prevent oops when GENERIC_TIME=n Aaro Koskinen reported an issue in kernel.org bugzilla #15366, where on non-GENERIC_TIME systems, accessing /sys/devices/system/clocksource/clocksource0/current_clocksource results in an oops. It seems the timekeeper/clocksource rework missed initializing the curr_clocksource value in the !GENERIC_TIME case. Thanks to Aaro for reporting and diagnosing the issue as well as testing the fix! Reported-by: Aaro Koskinen Signed-off-by: John Stultz Cc: Martin Schwidefsky Cc: stable@kernel.org LKML-Reference: <1267475683.4216.61.camel@localhost.localdomain> Signed-off-by: Thomas Gleixner commit 62c132a8008991530839401674ce8e1b12b005d3 Author: Eric Miao Date: Tue Mar 2 10:24:14 2010 +0800 [ARM] pxa: fix typo in mxm8x10.h Signed-off-by: Eric Miao commit 31436bbe8f85f79fc0ddb963edb3d29f6e2b3bae Author: Daniel Mack Date: Wed Feb 24 18:50:16 2010 +0100 [ARM] pxa/raumfeld: set GPIO drive bits for LED pins Set GPIO bits to pull the pins connected to LEDs for lower power mode. We want all LEDs off when devices are in suspend. Signed-off-by: Daniel Mack Signed-off-by: Eric Miao commit 438a22fe26c3fdeb422d92072523d5b35d849dc3 Author: Marc Zyngier Date: Thu Feb 18 20:33:02 2010 +0000 [ARM] pxa/zeus: Add support for mcp2515 CAN bus Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit fcfdc67ff2b104355683f7264a6559a0cc360646 Author: Marc Zyngier Date: Thu Feb 18 20:31:43 2010 +0000 [ARM] pxa/zeus: Add support for onboard max6369 watchdog Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit 90ac0dfd9f5931c9011b35ced0ba576e32656fb2 Author: Marc Zyngier Date: Thu Feb 18 20:30:31 2010 +0000 [ARM] pxa/zeus: Add Eurotech as the manufacturer Signed-off-by: Amit Walambe Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit 7ff27dfa6e484ff5d901ec075a623c06c46d7a0f Author: Marc Zyngier Date: Thu Feb 18 20:29:24 2010 +0000 [ARM] pxa/zeus: Correct the USB host initialisation flags Signed-off-by: Amit Walambe Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit 662b0836a667158284c8a4a091de745fd5637ff1 Author: Marc Zyngier Date: Fri Feb 19 14:07:37 2010 +0800 [ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress Zeus console port is wired to a 8250-compatible device (pxa UARTs are reserved to other uses). This patch allows such a configuration in the uncompress sequence. Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit c95efee13303d9ff9e67f2600174f492039311ce Author: Eric Miao Date: Fri Feb 19 13:49:39 2010 +0800 [ARM] pxa: refactor uncompress.h for non-PXA uarts The original patch came from Marc Zyngier where support of 8250-compatible UART is required to show the uncompress information. Modified a little bit here, including changes below: 1. #include is actually not necessary 2. introduced uart_{read,write}() for different base and shift 3. introduced uart_is_enabled() and assumed enabled always for non-PXA uarts Signed-off-by: Eric Miao Acked-by: Marc Zyngier commit 2029e5643a3c4fdd4ad20169fb950cc16e023d0c Author: Eric Miao Date: Tue Feb 2 23:39:35 2010 -0800 [ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs The irq_chip is not yet registered, so no default irq_chip.mask_ack(), which we have to handle it correctly manually here. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit df0c382436df5bdd74030baafa294b75c231ec8c Author: Haojian Zhuang Date: Wed Feb 3 10:01:18 2010 -0500 [ARM] mmp2: add handling on PMIC IRQ Since PMIC INT pin is a special pin of CPU, the status of PMIC INT pin needs to be cleared after PMIC IRQ occured. Now append the clear operation in irq chip handler. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit ce0ac4235972cc2533e4e2095396208b59117c57 Author: Haojian Zhuang Date: Thu Jan 28 12:34:59 2010 +0800 [ARM] mmp2: add support for board IRQs Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 0913b86ff7fe220a50c82baca4431e7d5a8da5c8 Author: Haojian Zhuang Date: Thu Jan 28 12:27:36 2010 +0800 [ARM] mmp2: add missing ICU register definitions Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 16144bfb83bb8319c07c18b57eac15368708d02c Author: Haojian Zhuang Date: Mon Jan 25 06:03:54 2010 -0500 [ARM] mmp2: add gpio initialization Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 247b4592f385622774de877f568fc30eb37dc831 Author: Haojian Zhuang Date: Mon Jan 25 06:03:25 2010 -0500 [ARM] mmp2: add mfpr setting Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 4e3b4da98e20c5dc58e544ac5b321c1942071f7f Author: Haojian Zhuang Date: Mon Jan 25 06:02:50 2010 -0500 [ARM] mmp2: add mask function in irq-mmp2.c Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit e8e6cb325671daa17c776ad53b70fd6213260368 Author: Eric Miao Date: Tue Jan 5 15:28:26 2010 +0800 MAINTAINERS: add maintainers for Marvell MMP2 (aka ARMADA610) support Cc: Haojian Zhuang Signed-off-by: Eric Miao commit e1cb7db2ef7f911dbe0edd5ff8d2216a817738d0 Author: Haojian Zhuang Date: Wed Jan 6 09:07:15 2010 -0500 [ARM] mmp: support jasper development board Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit ccffb1ad1f354aee0bdf33b6486ebb9476223c1b Author: Haojian Zhuang Date: Tue Jan 5 15:02:19 2010 +0800 [ARM] mmp: add default configuration for MMP2 Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 2f7e8faef5a50efaa1c173e99bdaa29e0129bb99 Author: Haojian Zhuang Date: Fri Dec 4 09:41:28 2009 -0500 [ARM] mmp: add support for Marvell MMP2 Marvell MMP2 (aka ARMADA610) is a SoC based on PJ4 core. It's ARMv6 compatible. Support basic interrupt handler and timer, and basic support for MMP2 based FLINT platform. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 978da5bcdb33f6e030fa3304662e2455a018f1b0 Author: Eric Miao Date: Tue Jan 5 15:06:37 2010 +0800 [ARM] mmp: rename irq.c to irq-pxa168.c to allow other SoC IRQ chips Signed-off-by: Eric Miao commit e6dac5e1b6ea7be4b0092ae0ac96b352a8c028db Author: Haojian Zhuang Date: Tue Jan 12 09:07:45 2010 +0800 [ARM] mmp: update pxa168_defconfig and include avengers lite support Signed-off-by: Gavin Gu Signed-off-by: Jing Xiang Signed-off-by: Jack Ren Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 9896de72d20686f4dbc9cdd64ca178c80d6838b6 Author: Haojian Zhuang Date: Tue Jan 12 08:54:50 2010 +0800 [ARM] mmp: avengers lite (pxa168) board bring up Signed-off-by: Gavin Gu Signed-off-by: Jing Xiang Signed-off-by: Jack Ren Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 0925e2f0fc5a55621cb80afbb6d4543c62e6a653 Author: Stefan Schmidt Date: Sat Feb 13 21:59:32 2010 +0100 [ARM] pxa/imote2: Remove redundant pin entry for nCS. Also remove a trailing whitespace while being there. Signed-off-by: Stefan Schmidt Signed-off-by: Eric Miao commit d496936f954f9886ac7037d013cdf3c279e627bd Author: Stefan Schmidt Date: Sun Feb 14 10:19:21 2010 +0100 [ARM] pxa/imote2: Add defconfig for the imote2 platform. Signed-off-by: Stefan Schmidt Signed-off-by: Eric Miao commit f9efc9df94fd126f7d585339e64edec0c03e904b Author: Eric Miao Date: Tue Feb 9 19:46:01 2010 +0800 ASoC: Remove legacy SSP API usage from pxa-ssp.c Acked-by: Mark Brown Signed-off-by: Eric Miao commit a056bef45529810183f56944dcea8b4e297c2dc3 Author: Eric Miao Date: Tue Feb 9 11:10:10 2010 +0800 [ARM] pxa: introduce PXA_SSP_LEGACY for legacy SSP API Signed-off-by: Eric Miao commit 98acdbe4cf83f5a2e21c7aac830146b5d6da9282 Author: Stefan Schmidt Date: Tue Feb 16 22:42:55 2010 +0100 [ARM] pxa: define zeus_power_off() only when CONFIG_PM enabled Add some safety check for CONFIG_PM around zeus_power_off(). Without it linking can fail like this: arch/arm/mach-pxa/built-in.o: In function `zeus_power_off': e800.c:(.text+0x2bc8): undefined reference to `pxa27x_cpu_suspend' Signed-off-by: Stefan Schmidt Acked-by: Marc Zyngier Signed-off-by: Eric Miao commit cfab57e0e44631b1369e05efa54031b993511c2f Author: Stefan Schmidt Date: Tue Feb 16 22:41:52 2010 +0100 [ARM] pxa: enable check_scoop_reg() only if CONFIG_PM is set. This function gets only called from scoop_suspend() and scoop_resume() which are only built in if we have CONFIG_PM set. Make it the same for check_scoop_reg(). This fixes the following warning: arch/arm/common/scoop.c:143: warning: ‘check_scoop_reg’ defined but not used Signed-off-by: Stefan Schmidt Signed-off-by: Eric Miao commit 1f3b536be7bfb3930cf7dc6d995d82877f25d6cf Author: Edwin Peer Date: Fri Feb 5 18:31:48 2010 +0200 [ARM] pxa: add support for Embedian MXM-8x10 Signed-off-by: Edwin Peer Signed-off-by: Eric Miao commit 0dc726bb264ca5ecfdfab94a6937e0e9b9b26f64 Author: Eric Miao Date: Sun Dec 27 23:01:25 2009 +0800 [ARM] pxa: move board board IRQ definitions out of irqs.h Signed-off-by: Eric Miao commit 19851c58e680f71d087b79b53edbf814193e1d33 Author: Eric Miao Date: Sat Dec 26 16:23:02 2009 +0800 [ARM] sa1111: allow cascaded IRQs to be used by platforms Signed-off-by: Eric Miao commit 08fa159003aa510027951671b94aadc380ab2d2a Author: Eric Miao Date: Sat Dec 26 12:32:38 2009 +0800 [ARM] sa1111: avoid using hardcoded IRQ numbers for PCMCIA driver The IRQs for card detect and status change are currently hardcoded in SA1111 PCMCIA driver, which can be actually obtained from the .irq[] from 'struct sa1111_dev' to keep it generic. Signed-off-by: Eric Miao commit ac609d266e4af4ebf586d610bd76e04dddae0c4c Author: Eric Miao Date: Thu Feb 4 18:07:33 2010 -0800 [ARM] locomo: allow cascaded IRQ base to be specified by platforms Signed-off-by: Eric Miao commit 00dd8027b913088ff9b656c5aaa6336c303b7f26 Author: Eric Miao Date: Fri Dec 25 12:18:33 2009 +0800 [ARM] locomo: remove unused IRQs and avoid unnecessary cascade IRQ_LOCOMO_* are never used elsewhere, remove these definitions. As well as the cascade of these IRQs. IRQ_LOCOMO_*_BASE changed to IRQ_LOCOMO_*. IRQ_LOCOMO_LT and IRQ_LOCOMO_SPI are likely to be used in a same way as IRQ_LOCOMO_KEY. IRQ_LOCOMO_GPIO and the demultiplex handler should really be living somewhere else. Signed-off-by: Eric Miao commit da8065ac3ea29d1bfdb5a163be346fbe35066f8d Author: Eric Miao Date: Thu Feb 4 17:13:55 2010 -0800 [ARM] locomo: avoid unnecessary cascaded keyboard IRQ It is not necessary and is over-complicated for IRQ_LOCOMO_KEY to be a cascaded IRQ of IRQ_LOCOMO_KEY_BASE. Removed and introduced locomokbd_{open,close} for masking/unmasking of the keyboard IRQ. Signed-off-by: Eric Miao commit efe7f8bda015b03ab1420b5bca538d18e6559863 Author: Eric Miao Date: Wed Dec 23 14:52:07 2009 +0800 [ARM] sa1100: remove unreferenced IRQ definitions These IRQ definitions related to LOCOMO are never referenced anywhere, thus could be safely removed. Signed-off-by: Eric Miao commit f69a6548c9d5dd29ecaed1c714b41487c458ce8b Author: Eric Miao Date: Fri Jan 1 15:28:21 2010 +0800 [ARM] pxa/tosa: make use of the matrix keypad driver Cc: Dmitry Eremin-Solenikov Signed-off-by: Eric Miao commit 96f6a13a6d8a6370fb9a8c828d549f3ddea8d0c5 Author: Eric Miao Date: Mon Jan 4 13:34:05 2010 +0800 [ARM] pxa/cm-x270: avoid direct access of GPIO/MFP registers Cc: Mike Rapoport Signed-off-by: Eric Miao commit 846c864cac520eaa10e845f585f05af643aa848a Author: Eric Miao Date: Mon Jan 4 17:14:21 2010 +0800 [ARM] pxa: remove now unnecessary pxa_gpio_mode() calls in ac97 Now most (if not all) PXA platforms have been switched to the new MFP API, it's rather safe to remove these unnecessary pxa_gpio_mode() calls in pxa2xx-ac97-lib.c now. Cc: Dmitry Eremin-Solenikov Cc: Mark Brown Signed-off-by: Eric Miao commit c11b6a420b092a576e003bbb520392268338d97b Author: Eric Miao Date: Mon Jan 4 17:00:13 2010 +0800 [ARM] pxa: add the missing AC97 pin configurations Missing AC97 pin configurations are added where pxa_set_ac97_info() are called for all pxa25x/pxa27x platforms. Where no exact configuration is provided, use the default as in sound/arm/pxa2xx-ac97-lib.c Cc: Dmitry Eremin-Solenikov Signed-off-by: Eric Miao commit fb1bf8cd13bfa7ed0364ab0d82f717fc020d35f6 Author: Eric Miao Date: Mon Jan 4 16:30:58 2010 +0800 [ARM] pxa: introduce processor specific pxa27x_assert_ac97reset() This is really pxa27x specific and should be kept in pxa27x.c. With this newly introduced function, the original set_resetgpio_mode() is deprecated. Cc: Dmitry Eremin-Solenikov Cc: Mark Brown Signed-off-by: Eric Miao commit e1aed7ca555af7412ca1336241b918d78485232f Author: Eric Miao Date: Mon Jan 4 16:26:32 2010 +0800 [ARM] pxa: remove the unnecessary restoring of MFP registers MFP registers are saved and restored by the mfp sys_device before all other platform devices, and it is unnecessary here. Cc: Dmitry Eremin-Solenikov Cc: Mark Brown Signed-off-by: Eric Miao commit bedbda97175bcc540512f67ce02364100fba5f28 Author: Eric Miao Date: Mon Jan 4 11:37:14 2010 +0800 [ARM] pxa: simplify the LCD pin configuration for pxa27x platforms Signed-off-by: Eric Miao commit 07bae6c3215e060d5e3742b6f2932de0787f0782 Author: Eric Miao Date: Mon Jan 4 11:25:10 2010 +0800 [ARM] pxa: simplify the LCD pin configuration for pxa25x platforms There are only limited possible LCD pin configurations for pxa25x platforms, simplify this by macro. Signed-off-by: Eric Miao commit 669cb51c6abf77e10cbeb6f483c96abc492206ac Author: Eric Miao Date: Fri Jan 1 15:29:22 2010 +0800 [ARM] pxa: use chip->ack() instead of accessing GEDR directly Signed-off-by: Eric Miao commit 1d40ddd10dab332456e3863fed2a6e71aa6635ab Author: Russell King Date: Mon Mar 1 16:19:23 2010 +0000 MTD: fix pismo build error Signed-off-by: Russell King commit bb1165d6882f423f90fc7007a88c6c993b7c2ac4 Author: Robert Richter Date: Mon Mar 1 14:21:23 2010 +0100 perf, x86: rename macro in ARCH_PERFMON_EVENTSEL_ENABLE For consistency reasons this patch renames ARCH_PERFMON_EVENTSEL0_ENABLE to ARCH_PERFMON_EVENTSEL_ENABLE. The following is performed: $ sed -i -e s/ARCH_PERFMON_EVENTSEL0_ENABLE/ARCH_PERFMON_EVENTSEL_ENABLE/g \ arch/x86/include/asm/perf_event.h arch/x86/kernel/cpu/perf_event.c \ arch/x86/kernel/cpu/perf_event_p6.c \ arch/x86/kernel/cpu/perfctr-watchdog.c \ arch/x86/oprofile/op_model_amd.c arch/x86/oprofile/op_model_ppro.c Signed-off-by: Robert Richter commit a163b1099dc7016704043c7fc572ae42519f08f7 Author: Robert Richter Date: Thu Feb 25 19:43:07 2010 +0100 perf, x86: add some IBS macros to perf_event.h Signed-off-by: Robert Richter commit 1d6040f17d12a65b9f7ab4cb9fd6d721206b79ec Author: Robert Richter Date: Thu Feb 25 19:40:46 2010 +0100 perf, x86: make IBS macros available in perf_event.h This patch moves code from oprofile to perf_event.h to make it also available for usage by perf. Signed-off-by: Robert Richter commit 86d62b6fa2845725ad88b95387c8c52731fb2460 Merge: 3d08340 cfc9c0b Author: Robert Richter Date: Mon Mar 1 11:13:21 2010 +0100 Merge remote branch 'tip/oprofile' into tip/perf/core Signed-off-by: Robert Richter commit 90a6501f94aedd7fb40f5556334843194fb598be Author: Paul E. McKenney Date: Sun Feb 28 08:32:18 2010 -0800 sched, rcu: Fix rcu_dereference() for RCU-lockdep Make rcu_dereference() of runqueue data structures be rcu_dereference_sched(). Located-by: Ingo Molnar Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <20100228163218.GD6846@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit e2f4699ac15fe36de1288505bc6e6e5a8603ab1b Merge: 1883c79 30ff056 Author: Ingo Molnar Date: Mon Mar 1 09:28:53 2010 +0100 Merge branch 'linus' into core/rcu Merge reason: Backmerge latest upstream to queue up dependent fix in the scheduler. Signed-off-by: Ingo Molnar commit 1e259e0a9982078896f3404240096cbea01daca4 Author: Frederic Weisbecker Date: Sun Feb 28 20:51:15 2010 +0100 hw-breakpoints: Remove stub unthrottle callback We support event unthrottling in breakpoint events. It means that if we have more than sysctl_perf_event_sample_rate/HZ, perf will throttle, ignoring subsequent events until the next tick. So if ptrace exceeds this max rate, it will omit events, which breaks the ptrace determinism that is supposed to report every triggered breakpoints. This is likely to happen if we set sysctl_perf_event_sample_rate to 1. This patch removes support for unthrottling in breakpoint events to break throttling and restore ptrace determinism. Signed-off-by: Frederic Weisbecker Cc: 2.6.33.x Cc: Peter Zijlstra Cc: K.Prasad Cc: Paul Mackerras commit ae1f30384baef4056438d81b305a6a5199b0d16c Author: Frederic Weisbecker Date: Sun Feb 28 19:42:38 2010 +0100 tracing: Include irqflags headers from trace clock trace_clock.c includes spinlock.h, which ends up including asm/system.h, which in turn includes linux/irqflags.h in x86. So the definition of raw_local_irq_save is luckily covered there, but this is not the case in parisc: tip/kernel/trace/trace_clock.c:86: error: implicit declaration of function 'raw_local_irq_save' tip/kernel/trace/trace_clock.c:112: error: implicit declaration of function 'raw_local_irq_restore' We need to include linux/irqflags.h directly from trace_clock.c to avoid such build error. Signed-off-by: Frederic Weisbecker Cc: Steven Rostedt Cc: Robert Richter Cc: Peter Zijlstra Signed-off-by: Ingo Molnar commit 1883c79a57a5fe25309007590cccb1b2782c41b2 Author: Paul E. McKenney Date: Sat Feb 27 14:53:08 2010 -0800 rcu: Make task_subsys_state() RCU-lockdep checks handle boot-time use It is apparently legal to invoke task_subsys_state() without RCU protection during early boot time. After all, there are no concurrent tasks, so there can be no grace periods completing concurrently. But this does need an Acked-by from the cgroups folks. Located-by: Ingo Molnar Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267311188-16603-2-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 622ea685f1fafdf84d612440535c84341f0860b8 Author: Paul E. McKenney Date: Sat Feb 27 14:53:07 2010 -0800 rcu: Fix holdoff for accelerated GPs for last non-dynticked CPU Make the holdoff only happen when the full number of attempts have been made. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267311188-16603-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 3d083407a16698de86b42aee0da2ffb280b5cb7e Author: Frederic Weisbecker Date: Sat Feb 27 17:24:15 2010 +0100 x86/hw-breakpoints: Remove the name field Remove the name field from the arch_hw_breakpoint. We never deal with target symbols in the arch level, neither do we need to ever store it. It's a legacy for the previous version of the x86 breakpoint backend. Let's remove it. Signed-off-by: Frederic Weisbecker Cc: K.Prasad Cc: Linus Torvalds commit dd8b1cf681eab40bc5afb67bdd06b2ca341f5669 Author: Frederic Weisbecker Date: Sat Feb 27 17:10:39 2010 +0100 perf: Remove pointless breakpoint union Remove pointless union in the breakpoint field of hw_perf_event. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Paul Mackerras commit b67577dfb45580c498bfdb1bc76c00c3b2ad6310 Author: Frederic Weisbecker Date: Wed Feb 3 09:09:33 2010 +0100 perf lock: Drop the buffers multiplexing dependency We need to deal with time ordered events to build a correct state machine of lock events. This is why we multiplex the lock events buffers. But the ordering is done from the kernel, on the tracing fast path, leading to high contention between cpus. Without multiplexing, the events appears in a weak order. If we have four events, each split per cpu, perf record will read the events buffers in the following order: [ CPU0 ev0, CPU0 ev1, CPU0 ev3, CPU0 ev4, CPU1 ev0, CPU1 ev0....] To handle a post processing reordering, we could just read and sort the whole in memory, but it just doesn't scale with high amounts of events: lock events can fill huge amounts in few times. Basically we need to sort in memory and find a "grace period" point when we know that a given slice of previously sorted events can be committed for post-processing, so that we can unload the memory usage step by step and keep a scalable sorting list. There is no strong rules about how to define such "grace period". What does this patch is: We define a FLUSH_PERIOD value that defines a grace period in seconds. We want to have a slice of events covering 2 * FLUSH_PERIOD in our sorted list. If FLUSH_PERIOD is big enough, it ensures every events that occured in the first half of the timeslice have all been buffered and there are none remaining and there won't be further to put inside this first timeslice. Then once we reach the 2 * FLUSH_PERIOD timeslice, we flush the first half to be gentle with the memory (the second half can still get new events in the middle, so wait another period to flush it) FLUSH_PERIOD is defined to 5 seconds. Say the first event started on time t0. We can safely assume that at the time we are processing events of t0 + 10 seconds, ther won't be anymore events to read from perf.data that occured between t0 and t0 + 5 seconds. Hence we can safely flush the first half. To point out funky bugs, we have a guardian that checks a new event timestamp is not below the last event's timestamp flushed and that displays a warning in this case. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Steven Rostedt Cc: Paul Mackerras Cc: Hitoshi Mitake Cc: Li Zefan Cc: Lai Jiangshan Cc: Masami Hiramatsu Cc: Jens Axboe commit 84c6f88fc8265d7a712d7d6ed8fc1a878dfc84d1 Author: Hitoshi Mitake Date: Thu Feb 4 16:08:15 2010 +0900 perf lock: Fix and add misc documentally things I've forgot to add 'perf lock' line to command-list.txt, so users of perf could not find perf lock when they type 'perf'. Fixing command-list.txt requires document (tools/perf/Documentation/perf-lock.txt). But perf lock is too much "under construction" to write a stable document, so this is something like pseudo document for now. And I wrote description of perf lock at help section of CONFIG_LOCK_STAT, this will navigate users of lock trace events. Signed-off-by: Hitoshi Mitake Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1265267295-8388-1-git-send-email-mitake@dcl.info.waseda.ac.jp> Signed-off-by: Frederic Weisbecker commit 44ee63587dce85593c22497140db16f4e5027860 Author: Tejun Heo Date: Wed Feb 17 10:50:50 2010 +0900 percpu: Add __percpu sparse annotations to hw_breakpoint Add __percpu sparse annotations to hw_breakpoint. These annotations are to make sparse consider percpu variables to be in a different address space and warn if accessed without going through percpu accessors. This patch doesn't affect normal builds. In kernel/hw_breakpoint.c, per_cpu(nr_task_bp_pinned, cpu)'s will trigger spurious noderef related warnings from sparse. Changing it to &per_cpu(nr_task_bp_pinned[0], cpu) will work around the problem but deemed to ugly by the maintainer. Leave it alone until better solution can be found. Signed-off-by: Tejun Heo Cc: Stephen Rothwell Cc: K.Prasad LKML-Reference: <4B7B4B7A.9050902@kernel.org> Signed-off-by: Frederic Weisbecker commit 018cbffe6819f6f8db20a0a3acd9bab9bfd667e4 Merge: 1dd2980 60b341b Author: Frederic Weisbecker Date: Sat Feb 27 16:18:46 2010 +0100 Merge commit 'v2.6.33' into perf/core Merge reason: __percpu annotations need the corresponding sparse address space definition upstream. Conflicts: tools/perf/util/probe-event.c (trivial) commit 98e12b5a6e05413420a7e3b3eca7fbfc2ff41b6d Author: Russell King Date: Thu Feb 25 23:56:38 2010 +0000 ARM: Fix decompressor's kernel size estimation for ROM=y Commit 2552fc2 changed the way the decompressor decides if it is safe to decompress the kernel directly to its final location. Unfortunately, it took the top of the compressed data as being the stack pointer, which it is for ROM=n cases. However, for ROM=y, the stack pointer is not relevant, and results in the wrong answer. Fix this by explicitly storing the end of the biggybacked data in the decompressor, and use that to calculate the compressed image size. CC: Signed-off-by: Russell King commit 2a2d10f386c1bacabe1a530c06dc8488eac419e5 Merge: 2f68ffd c499546 Author: Russell King Date: Thu Feb 25 20:41:34 2010 +0000 Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable commit 9b1489e989695c4d502865f8bec616c0f17e99ab Merge: bac3fcf 08268b7 Author: Uwe Kleine-König Date: Thu Feb 25 14:01:49 2010 +0100 Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/master Removed selection of COMMON_CLKDEV by CONFIG_ARCH_MX5. This is handled in 03e09cd8902717b66f940357257d8ad76114d9f2. arch/arm/plat-mxc/iomux-mx1-mx2.c was moved to arch/arm/plat-mxc/iomux-v1.c in 5e2e95f520538e095d10456acd28d9107317aa32 and got bug fixed in 5c17ef878fa25e04b1e8f1d8f5fa8b267753472c. The bug in arch/arm/plat-mxc/iomux-v1.c isn't present any more since bac3fcfad565c9bbceeed8b607f140c29df97355, so arch/arm/plat-mxc/iomux-mx1-mx2.c is simply deleted. Conflicts: arch/arm/plat-mxc/Kconfig arch/arm/plat-mxc/Makefile arch/arm/plat-mxc/iomux-mx1-mx2.c Signed-off-by: Uwe Kleine-König commit 3e58974027b04e84f68b964ef368a6cd758e2f84 Author: Nikanth Karthikesan Date: Thu Feb 25 14:44:56 2010 +0530 doc: fix typo in comment explaining rb_tree usage Fix typo in comment explaining rb_tree usage. s/int/in Signed-off-by: Nikanth Karthikesan Signed-off-by: Jiri Kosina commit 17ccb834d517c66c09123c24ba8553c5b14e0f78 Author: Kuninori Morimoto Date: Tue Feb 23 07:07:01 2010 +0000 ARM: mach-shmobile: ap4evb: Add KEYSC support Because AP4 board has capacitor for KEYSC, we need much time for waiting. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit d608c738bb8fb37e5fbfcdef9c566764f2fea086 Author: Mark Brown Date: Wed Feb 24 16:45:54 2010 +0000 ARM: S3C64XX: Add initial support for board specific IRQs Follow the scheme used for IRQs. By default 16 GPIOs are allocated for board use. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit e6502522c2850968a086284d0f28de4fb880eb78 Author: Kukjin Kim Date: Wed Feb 24 16:41:01 2010 +0900 ARM: S5PV210: Add S5PC110 configuration file This patch adds S5PC110 default configuration file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit af60ca4f291713111e397031e2abffa66c6c857f Author: Kukjin Kim Date: Wed Feb 24 16:40:57 2010 +0900 ARM: S5PV210: Add S5PV210 configuration file This patch adds S5PV210 default configuration file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit d515ec339bf7970c8f6e368c8c7bb330417dcda9 Author: Kukjin Kim Date: Wed Feb 24 16:40:53 2010 +0900 ARM: S5PV210: Add SMDKC110 board support file This patch adds SMDKC110 board support file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 981744165e31410bd7bc973fd259f24b836d0346 Author: Kukjin Kim Date: Wed Feb 24 16:40:49 2010 +0900 ARM: S5PV210: Add SMDKV210 board support file This patch adds SMDKV210 board support file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 170f4e425808b801f81bb6be24b2c1eb80313d8e Author: Kukjin Kim Date: Wed Feb 24 16:40:44 2010 +0900 ARM: S5PV210: Update Kconfig and Makefiles Updates arch/arm Kconfig and Makefile for building the S5PV210 support. Also modifies the plat-s5p Kconfig file to include the support for plat-s5p for S5PV210. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 2c798557b9e0961e545e526197654d9437a6330e Author: Kukjin Kim Date: Wed Feb 24 16:40:40 2010 +0900 ARM: S5PV210: Add IRQ support This patch adds IRQ support for S5PV210. This patch adds interrupt register definitions, IRQ definitions for various interrupt sources and new VIC base for VIC2 and VIC3 in plat-s5p common irq code. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 0c1945d336116e82454b5461238618ef81696669 Author: Kukjin Kim Date: Wed Feb 24 16:40:36 2010 +0900 ARM: S5PV210: Add clock support for S5PV210 This patch adds clock support for S5PV210. This patch adds the clock register definitions and the various system clocks in S5PV210. Clocks that are common to other S5P SoC'c are added in the common S5P clock support. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 939d28aae17a0cb591a2ec54993496a5d31f2ec6 Author: Kukjin Kim Date: Wed Feb 24 16:40:29 2010 +0900 ARM: S5PV210: Add Samsung S5PV210 CPU support This patch adds support for Samsung S5PV210 CPU. This patch also adds an entry for S5PV210 cpu in plat-s5p cpu table. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 7c821a179f91c3ad52588400ce52a7fb48b9868c Author: Jiri Kosina Date: Wed Feb 24 13:55:31 2010 +0100 Remove fs/ntfs/ChangeLog Remove fs/ntfs/ChangeLog. No need for such files since we have git. Acked-by: Anton Altaparmakov Signed-off-by: Jiri Kosina commit a8ab0102d7f031e477dbe31450d5b69d40bea324 Author: Thadeu Lima de Souza Cascardo Date: Mon Feb 1 15:57:15 2010 -0200 doc: fix console doc typo Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit e21a05cb408bb9f244f11a0813d4b355dad0822e Author: GeunSik Lim Date: Wed Feb 24 11:06:39 2010 +0100 doc: cpuset: Update the cpuset flag file This patch is for modifying with correct cuset flag file. We need to update current manual for cpuset. For example, before) cpus, cpu_exclusive, mems after ) cpuset.cpus, cpuset.cpu_exclusive, cpuset.mems Signed-off-by: Geunsik Lim Acked-by: Paul Menage Signed-off-by: Jiri Kosina commit 08268b78d6f0c659dc1d86453c57b336f6f4f9ae Author: Baruch Siach Date: Wed Feb 24 11:31:31 2010 +0200 mx25: move ARCH_MXC_IOMUX_V3 to the ARCH level ARCH_MXC_IOMUX_V3 is not specific to the i.MX25 PDK platform. Thus, ARCH_MXC_IOMUX_V3 should be selected by ARCH_MX25. Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 82d52a1948254aa3f35ca1a24c23284bd9f9a9c2 Author: Fabio Estevam Date: Wed Feb 17 12:02:56 2010 -0800 mx51_babbage: Fix ckih2 parameter in mx51_clocks_init function This patch is to be applied into Sascha's mxc-master branch. Fix ckih2 parameter in mx51_clocks_init funtion. CKIH2 pin is left unconnected on Babbage. Signed-off-by: Fabio Estevam Acked-by: Amit Kucheria Signed-off-by: Sascha Hauer commit cd6eb9808ce54caeea779e785e19a9b9bea97e43 Author: Mark Brown Date: Tue Feb 23 11:05:11 2010 +0000 mx31ads: Configure SSI5 pins in IOMUX for PMIC module audio support SSI5 on the CPU is connected to the PMIC module to provide audio support so unconditionally configure the relevant pins on the CPU to route out the signals. Signed-off-by: Mark Brown Signed-off-by: Sascha Hauer commit bac3fcfad565c9bbceeed8b607f140c29df97355 Author: Uwe Kleine-König Date: Mon Feb 15 09:47:55 2010 +0100 arm/imx/iomux-v1: check for invalid modes in mxc_gpio_mode mxc_gpio_mode checks for invalid pins and so it returns zero for success, -EINVAL for invalid pins. While at it, remove definitions of GPIO_PORT_MAX removed as they are unused now. Signed-off-by: Uwe Kleine-König commit e835d88e71f54c048a8cc907cc34084f1dd5846b Author: Uwe Kleine-König Date: Tue Feb 16 11:07:49 2010 +0100 arm/imx: let platform files include the SoC-specific iomux header Signed-off-by: Uwe Kleine-König commit 111588f8304b7e13f107bd4c590e8d3939ad907d Author: Uwe Kleine-König Date: Mon Feb 15 21:52:34 2010 +0100 arm/imx/iomux-v1: rename header file Addionally make iomux-mx*.h headers stand-alone and similar to iomux-v3 platform files should include their platform iomux header from now on. For now iomux.h simply includes all iomux-v1 platform headers and so provides compatibility until all files are converted. Signed-off-by: Uwe Kleine-König commit 261f6f681ced65de82a619f6802ebe82fd9af080 Author: Uwe Kleine-König Date: Mon Feb 15 21:18:43 2010 +0100 arm/mx25: don't include iomux.h which is for iomux-v1 machines Signed-off-by: Uwe Kleine-König commit 2f6c97c48e727d1bbd3131527380da19161f6f5f Author: Uwe Kleine-König Date: Mon Feb 15 21:10:39 2010 +0100 arm/imx/iomux-mx3.h: unify style and comments - use __MACH_IOMUX_MX3_H__ as header protector analogous to - use tabs for indention Signed-off-by: Uwe Kleine-König commit 8902cbd9dbd290ce273c372eec08dfdb14757a47 Author: Uwe Kleine-König Date: Mon Feb 15 21:04:17 2010 +0100 arm/imx/iomux-mx2x: unify style - use __MACH_IOMUX_MX2x_H__ as header protector analogous to - use tabs for indention Signed-off-by: Uwe Kleine-König commit 6056154145bd6c6ec4eeeaee65f6b12c5b88b1d7 Author: Uwe Kleine-König Date: Mon Feb 15 20:56:03 2010 +0100 arm/imx/iomux-mx27: unify style and comments - use __MACH_IOMUX_MX27_H__ as header protector analogous to - use tabs for indention - fix sorting Signed-off-by: Uwe Kleine-König commit e76feb87422c0bb7517cd97be342f55fab743d3a Author: Uwe Kleine-König Date: Mon Feb 15 20:50:57 2010 +0100 arm/imx/iomux-mx25: unify style and comment cleanup - use __MACH_IOMUX_MX25_H__ as header protector analogous to - remove doxygen comments - remove #error about mach/iomux.h which is unused on mx25 - remove #ifndef __ASSEMBLY__ which is unneeded here Signed-off-by: Uwe Kleine-König commit 6985a719f96e1d83258b47eb170bf44969860ca3 Author: Uwe Kleine-König Date: Mon Feb 15 20:46:47 2010 +0100 arm/imx/iomux-mx21: unify style - use __MACH_IOMUX_MX21_H__ as header protector analogous to - use tabs for indention Signed-off-by: Uwe Kleine-König commit 6863f1981060832536f2d06c20c0219b2e74c477 Author: Uwe Kleine-König Date: Mon Feb 15 20:39:59 2010 +0100 arm/imx/iomux-mx1: unify style and comment cleanup - use __MACH_IOMUX_MX1_H__ as header protector analogous to - use tabs for indention Signed-off-by: Uwe Kleine-König commit f021b5a1ef1b229ddc8c5cf3f2c5da308d974a5a Author: Uwe Kleine-König Date: Mon Feb 15 16:57:09 2010 +0100 arm/imx/iomux-v1: make base address a runtime choice While at it move register modification to static inlines and so make the relevant code more readable. Signed-off-by: Uwe Kleine-König commit 5e2e95f520538e095d10456acd28d9107317aa32 Author: Uwe Kleine-König Date: Mon Feb 15 09:42:59 2010 +0100 arm/imx/iomux-v1: rename source file and reorganize Kconfig stuff Signed-off-by: Uwe Kleine-König commit 8735fde2d0c42ae914d3e68d967612ff417f463c Author: Uwe Kleine-König Date: Wed Feb 17 22:17:43 2010 +0100 arm/imx/dma-v1: protect #ifdef'd blocks additionally by cpu_is_... This is necessary for a multi-SoC kernel. Signed-off-by: Uwe Kleine-König commit e9f49d4183759e4d8469ac86189ef8bc4374cccc Author: Uwe Kleine-König Date: Wed Feb 17 19:37:05 2010 +0100 arm/imx/dma-v1: don't use deprecated symbols DMA_BASE and MXC_INT_DMACH0 Signed-off-by: Uwe Kleine-König commit 8e3a6e7fa739d021324d813cd6fdd1c5c7998774 Author: Uwe Kleine-König Date: Wed Feb 17 21:05:27 2010 +0100 arm/imx: choose sane CONSISTENT_DMA_SIZE if video is enabled for both mx1 and mx3 Signed-off-by: Uwe Kleine-König commit abf61632884ae6bfd1e7b967d5254fa7b5191e7b Author: Uwe Kleine-König Date: Wed Feb 17 21:08:00 2010 +0100 arm/imx/irq: order definitions of MXC_GPIO_IRQS numerically This is important for kernels supporting more than one SoC. Signed-off-by: Uwe Kleine-König commit 220f7f307015e876a11bf906bf9d7fe669a097a1 Author: Uwe Kleine-König Date: Mon Feb 15 17:11:17 2010 +0100 arm/imx: don't depend on ARCH_MXC twice MXC_IRQ_PRIOR, MXC_PWM and ARCH_HAS_RNGA are all defined in an "if ARCH_MXC" ... "endif" block, so they depend on ARCH_MXC anyhow. Signed-off-by: Uwe Kleine-König commit a8e33260ce184aea367fa11ae8bd3ab941e75b49 Author: Uwe Kleine-König Date: Fri Feb 19 15:29:26 2010 +0100 arm/imx: remove #ifndef CONFIG_COMMON_CLKDEV block COMMON_CLKDEV is used on all imx platforms, so this isn't used. Signed-off-by: Uwe Kleine-König commit 44fb5d1945fe87f3299de5e2e0581f092e8dd455 Author: Uwe Kleine-König Date: Fri Feb 19 17:08:42 2010 +0100 arm/imx: remove MTD_XIP support This is broken since at least one year when ec996ba (mxc timer: make compile time independent) removed the symbol MXC_TCN. Signed-off-by: Uwe Kleine-König commit 9f69fdb36da31672b0e40712fed494182530c887 Author: Uwe Kleine-König Date: Fri Feb 19 16:16:09 2010 +0100 arm/imx: don't explicitly select GENERIC_GPIO ARCH_REQUIRE_GPIOLIB selects GPIOLIB which in turn selects GENERIC_GPIO Signed-off-by: Uwe Kleine-König commit 03e09cd8902717b66f940357257d8ad76114d9f2 Author: Uwe Kleine-König Date: Mon Feb 15 17:10:42 2010 +0100 arm/imx: let ARCH_MXC select COMMON_CLKDEV instead of each subfamily Signed-off-by: Uwe Kleine-König commit 401d87dd66693605147f955ac2a4f1c0ac155027 Author: Uwe Kleine-König Date: Mon Feb 15 09:54:46 2010 +0100 arm/imx: remove "NO_PAD_CTRL" from Copyright statements I assume this was introduced by something like sed -i -e 's/)/, NO_PAD_CTRL)' Signed-off-by: Uwe Kleine-König commit 8e9980588c734c29f4322922e35ea509168e9fb5 Author: Uwe Kleine-König Date: Fri Feb 12 22:38:31 2010 +0100 arm/imx/audmux-v2: use SoC-prefixed names Signed-off-by: Uwe Kleine-König commit 51918075d74978d6ca6ec14c81f55938f24108a2 Author: Uwe Kleine-König Date: Fri Feb 12 22:38:31 2010 +0100 arm/imx/audmux-v1: use SoC-prefixed names Signed-off-by: Uwe Kleine-König commit 6574305b0ed32f286dcebd653a2f3ba4e421f06c Author: Uwe Kleine-König Date: Mon Feb 8 21:07:16 2010 +0100 arm/imx/gpio: remove a BUG_ON in hot path Now if the problem occurs that triggered the BUG_ON before, the machine runs in a NULL pointer dereference. So it wouldn't be much harder now to debug the situation if it occured. Signed-off-by: Uwe Kleine-König commit 3621f188b945a9f9bc1387115834041b7a4619e0 Author: Uwe Kleine-König Date: Mon Feb 8 21:02:30 2010 +0100 arm/imx/gpio: use fls to find set bits in the irq status register As in most cases only few irqs are pending using fls is more effective than looping over all bits. Signed-off-by: Uwe Kleine-König commit 3244c3e7797d235250cd01d4a1d3f60b3b2f6261 Author: Uwe Kleine-König Date: Mon Feb 8 20:34:27 2010 +0100 arm/imx: use generic_handle_irq instead of open-coding it Signed-off-by: Uwe Kleine-König commit 3d40f7fef45c0173e98dcdad6a9d642127331c66 Author: Uwe Kleine-König Date: Fri Feb 5 22:14:37 2010 +0100 arm/imx/gpio: GPIO_INT_{HIGH,LOW}_LEV are not necessarily constant GPIO_INT_LOW_LEV is defined as (cpu_is_mx1_mx2() ? 0x3 : 0x0) so depending on compiler optimisation and enabled SoCs this doesn't qualify as a constant expression as needed by a switch statement. Ditto for GPIO_INT_HIGH_LEV. Signed-off-by: Uwe Kleine-König commit 4a50d00cb90dd5dd79e40281a8719a1fc673c2a5 Author: Uwe Kleine-König Date: Fri Feb 5 22:00:11 2010 +0100 arm/mx2: split generic.c into mm-imx2[17].c This removes some #ifdefs and prepares moving the files in a directory with more than imx21 and imx27 support. Signed-off-by: Uwe Kleine-König commit 621b0e53b5059bf5641c3294c31ac2949c966c93 Author: Uwe Kleine-König Date: Fri Feb 5 17:44:33 2010 +0100 arm/mx2/devices: no need for IMX_NEEDS_DEPRECATED_SYMBOLS any more The previous commits cleaned up arch/arm/mach-mx2/devices.c such that it doesn't rely on deprecated symbols any more. Signed-off-by: Uwe Kleine-König commit 897359d596ca406aaa9f9687b439b4498b579d7f Author: Uwe Kleine-König Date: Fri Feb 5 17:40:28 2010 +0100 arm/mx2: define seperate gpio port descriptions for imx21 and imx27 As the gpio ports have different addresses on imx21 and imx27 there are two different port descriptions needed if not relying on the overloaded cpp macro IO_ADDRESS. So some cpp magic is added to minimize code duplication. Signed-off-by: Uwe Kleine-König commit 3636a145321573f2f735e3ae69f87e0fb166abec Author: Uwe Kleine-König Date: Thu Feb 11 16:31:49 2010 +0100 arm/mx2: use per-SOC nand device The previous commit introduced one nand device per SoC. Use this directly instead of the compatibility macro that will break for multi-SoC kernels. And while at it remove the compatibility macro now that all in-tree users are fixed. Signed-off-by: Uwe Kleine-König commit 2e5070bc1152e8afbf76734e8e3fbfbe60a573ef Author: Jassi Brar Date: Wed Feb 17 19:03:19 2010 +0000 ARM: S3C64XX: Declare IISv4 PCLK for S3C6410 [Updated the device ID to -1 since there's only one IISv4 device but the S3C clock API tries to match based on the ID of the requesting device (and not the name) -- broonie.] Signed-Off-by: Jassi Brar [ben-linux@fluff.org: Fixed Jassi's lastname] Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit de6985be185167d14a79695f345025c531a685d0 Author: Jassi Brar Date: Fri Feb 12 10:38:51 2010 +0000 ARM: S3C64XX: Add AC97 platform resources This patch defines the platform device and the resources: IRQ, DMA and MEM, needed by the AC97 controller driver. Signed-off-by: Jassi Brar Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 1f1008684a392f92c174252243d72a3297d6fa46 Author: Mark Brown Date: Wed Feb 17 19:03:20 2010 +0000 ARM: SMDK6410: Register IISv4 device The IISv4 controller is connected to the WM8580 on the board. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit a7a81d0bbd7820b279b14dbe00041a603c3cbf84 Author: Mark Brown Date: Wed Feb 17 18:19:31 2010 +0000 ARM: SMDK6410: Add support for PMIC LED on WM1192-EV1 PMIC module The PMIC LED on the SMDK6410 CPU board is driven by GPIO4 of the WM8312 PMIC. Provide software control of this LED. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 60f9101a8881797fecd89450b8a8d17a440e6281 Author: Mark Brown Date: Wed Feb 17 18:19:29 2010 +0000 ARM: SMDK6410: Add initial support for WM1192-EV1 PMIC board The Wolfson Microelectronics 1192-EV1 is a plug in module for the SMDK6410 providing power using a WM8312 PMIC. This patch provides initial hookup sufficient to initialise the board, though not all features are fully described yet. As part of this supplies for the system that are provided as a single supply by one of the currently merged PMIC boards are factored out so they can be reused between different regulators. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit bc449e53121681d16fbefb9c14d28b0638ae33db Author: Jassi Brar Date: Fri Feb 12 10:38:52 2010 +0000 ARM: S3C2443: GPIO: Correct AC97 pin defines GPIO_E-[5,9] pin functionality was defined incorrectly. The patch corrects and adds missing pins. Signed-off-by: Jassi Brar Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit c2b2c645dbeecb3433021ea71c6bbed70a1e9db6 Author: Jassi Brar Date: Fri Feb 12 10:38:50 2010 +0000 ARM: SMDK2443: Enable AC97 device Add AC97 controller to platform devices and initialize the AC97 gpios. Signed-off-by: Jassi Brar Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 1088f336ccc73feaaff2f95eec6fb5b6e7e94337 Author: Ben Dooks Date: Wed Feb 24 01:46:10 2010 +0000 ARM: SAMSUNG: Fix UART number for S5P6442 The recent changes in the UART code mean that we need to ensure that the 4 UART case is only selected if S5PV210 is being compiled. Signed-off-by: Ben Dooks commit 03843a1294073c19783b43f60f3a455dd0672685 Author: Kukjin Kim Date: Fri Jan 29 10:23:40 2010 +0900 ARM: S5P6442: Add serial port support This patch adds UART serial port support for S5P6442. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 7f7035f21c10d83994e045a98c0906781dba02d3 Author: Kukjin Kim Date: Fri Jan 29 10:22:47 2010 +0900 ARM: S5P6442: Add S5P6442 configuration file This patch adds S5P6442 default configuration file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 461859db1f367200602d81c9352e2477a6187814 Author: Kukjin Kim Date: Fri Jan 29 10:21:16 2010 +0900 ARM: S5P6442: Add SMDK6442 board support file This patch adds SMDK6442 board support file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 550db7f155c9e51288fbe114fbb33d7a044d8a75 Author: Kukjin Kim Date: Fri Jan 29 10:19:26 2010 +0900 ARM: S5P6442: Update Kconfig and Makefiles Updates arch/arm Kconfig and Makefile for building the S5P6442 support. Also modifies the plat-s5p Kconfig file to include the support for plat-s5p for S5P6442. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit d13de2ab8a7afe2d915be4c4758fe25825204226 Author: Ben Dooks Date: Wed Feb 24 01:43:27 2010 +0000 ARM: S5P6442: Add files missing from original commit The removal of plat-s3c has left these missing from the initial commit, so add copies from elsewhere. Signed-off-by: Ben Dooks commit d9f18a981bd0a724c87d04db1d61d91261a2feb4 Author: Kukjin Kim Date: Fri Jan 29 10:17:20 2010 +0900 ARM: S5P6442: Add IRQ support This patch adds IRQ support for S5P6442. This patch adds interrupt register definitions, IRQ definitions for various interrupt sources and new VIC base for VIC2 in plat-s5p common irq code. Signed-off-by: Adityapratap Sharma Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit b6f837575edc5213e00903afea240f0119ee5ec9 Author: Kukjin Kim Date: Thu Feb 4 09:42:13 2010 +0900 ARM: S5P6442: Add clock support for S5P6442 This patch adds clock support for S5P6442. This patch adds the clock register definitions and the various system clocks in S5P6442. Signed-off-by: Adityapratap Sharma Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 5f7f6a4a0df9b43051d57fdb8ea96c083247a08f Author: Kukjin Kim Date: Fri Jan 29 10:12:14 2010 +0900 ARM: S5P6442: Add Samsung S5P6442 CPU support This patch adds support for Samsung S5P6442 CPU. This patch also adds an entry for S5P6442 cpu in plat-s5p cpu table. Signed-off-by: Adityapratap Sharma Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit a0af8b3c701d254b55fc291150d5320317c0a338 Author: Vasily Khoruzhick Date: Thu Feb 18 18:32:29 2010 +0200 ARM: SAMSUNG: adc: disable/enable IRQ on suspend/resume IRQ should be disabled on suspend and re-enabled on resume. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit 0fe1309b4db2a994d0b8347cea034cf58cb4b312 Author: Vasily Khoruzhick Date: Thu Feb 18 18:32:27 2010 +0200 ARM: SAMSUNG: Add resources description for s3c24xx ts driver Without resources description driver fails during initialization. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit 7965b214bfbe0e6b3dc843cd1d639dc2711ff86e Author: Ben Dooks Date: Tue Feb 23 00:18:36 2010 +0000 ARM: SAMSUNG: Eliminate plat-s3c The plat-s3c directory is now clear, so remove the files in it and expunge it from the build process. Signed-off-by: Ben Dooks commit f94327f2cebf3711defd25375df0c380562127ba Author: Ben Dooks Date: Fri Jan 29 09:02:20 2010 +0000 ARM: SAMSUNG: Move include/mach files out of plat-s3c Move the include/mach files out of plat-s3c and into the relevant machine files. This does mean copying the files, but there is nowhere else to put them. Signed-off-by: Ben Dooks commit ae5fa355ec571525fab60f66dd9d6a2b12c7575e Author: Ben Dooks Date: Fri Jan 29 09:02:19 2010 +0000 ARM: SAMSUNG: Select NO_IOPORT for plat-samsung All these platforms select NO_IOPORT, so move it to plat-samsung Kconfig Signed-off-by: Ben Dooks commit 46ba2a7284fbd61fcba1e16bdd723c79ec5c268f Author: Ben Dooks Date: Fri Jan 29 09:02:18 2010 +0000 ARM: S3C24XX: Move audio-simtec.h to plat-s3c24xx Continue the clearout of plat-s3c by moving audio-simtec.h to plat-s3c24xx as there are no current implementations outside of this platform. Signed-off-by: Ben Dooks commit 89f1fa080b5dca259c9779bcf81b95a409fdbf5b Author: Ben Dooks Date: Fri Jan 29 09:02:17 2010 +0000 ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx Move the Kconfig entries from plat-s3c to plat-samsung and plat-s3c24xx as necessary. The S3C_BOOT entries and the DMA configuration can go to plat-samsung. The low-level UART configurations are currently S3C2XX specific and can go to plat-s3c24xx. Eliminating plat-s3c from the build process will be submitted seperately. Signed-off-by: Ben Dooks commit c499546f43f2c31b681271ef7db922839fcde5fe Author: Sebastien Requiem Date: Tue Feb 23 14:51:24 2010 +0100 [ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo) * Modification of Kconfig to add the Option * 1 new file : buffalo-wxl-setup.c This file is inspired from the db-78xx0-setup.c already present. The following is done: - Configure MPP Lines for the plateform (see my patch for MPP) This is taken from the stock kernel provided by buffalotech (the vendor) - GigaBit Ethernet - Sata - Uart are initiallized in a different way than on the dev board as we have one core only. - USB The kernel has been running for some days now on my plateform. Signed-off-by: Sebastien Requiem Signed-off-by: Nicolas Pitre commit ee40ceab234d34abdfeb9922d0f1a18bfa7efdaf Author: Sebastien Requiem Date: Tue Feb 23 14:38:14 2010 +0100 [ARM] MV78XX0: MPP routines and definitions This patch is composed of two new files : - mpp.c which is mainly inspired by the same file as in mach-kirkwood - mpp.h that is written from the documentation provided by Marvell http://www.marvell.com/products/processors/embedded/discovery_innovation/HW_MV78100_OpenSource.pdf Moreover, due to some implementation problem, I have defined some MPPX_UNUSED that offer developers the possibility to SET MPP to some unused value (such as for Buffalo WXL). Note: This patch doesn't support MV78200 yet (only 78100 MPP lines have been written) Signed-off-by: Sebastien Requiem Signed-off-by: Nicolas Pitre commit d5b5746bed1023e4a55f96405422d3e51968fa43 Author: John Holland Date: Fri Feb 19 23:11:04 2010 +0100 [ARM] eSATA SheevaPlug: correlate MPP to SD CD and SD WP Accept SD CD and SD WP in accordance to http://plugcomputer.org/data/docs/Sheeva-PowerPlug-V1.3-GTI-090906.pdf on MPP 47 and 44 respectively on the eSATA SheevaPlug Signed-off-by: John Holland Signed-off-by: Nicolas Pitre -- commit d7b222d708e6eff0cf47928f439c8bcf49f10bb6 Author: John Holland Date: Fri Feb 19 23:11:01 2010 +0100 [ARM] eSATA SheevaPlug: configure SoC SATA interface Enable the kirkwood SATA SoC interface on the eSATA SheevaPlug. Signed-off-by: John Holland Signed-off-by: Nicolas Pitre -- commit d8ecb3490050b33bf46ce77c7f239e0fc51a6835 Author: John Holland Date: Fri Feb 19 23:10:58 2010 +0100 [ARM] eSATA SheevaPlug basic board support Allow basic eSATA SheevaPlug board configuration and build. Signed-off-by: John Holland Signed-off-by: Nicolas Pitre -- commit 41dcc17c735d4e99a91002b09850d0f09ee4ab4b Author: Kuninori Morimoto Date: Fri Feb 19 07:52:12 2010 +0000 ARM: mach-shmobile: pfc-sh7377: modify KEYIN settings Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 6c6971dc4e8c23bb61bf309898e1693f9c5c8c24 Author: Ben Dooks Date: Fri Jan 29 09:02:16 2010 +0000 ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung Move the init.c and time.c files to plat-samsung from plat-s3c, thus clearing the last files that are being built in here. Signed-off-by: Ben Dooks commit 2c420fe22f3d526691773288807d010068ce3033 Author: Ben Dooks Date: Fri Jan 29 09:02:15 2010 +0000 ARM: SAMSUNG: Move DMA support to plat-samsung Move the core of the DMA support to plat-samsung for everyone to use. Signed-off-by: Ben Dooks commit 806c17b5497f62faa65a1fdd235b7fa2df17d704 Author: Ben Dooks Date: Fri Jan 29 09:02:14 2010 +0000 ARM: SAMSUNG: Move pm.c to plat-samsung Move pm.c to plat-samsung, it should be usable by all Samsung systems Signed-off-by: Ben Dooks commit 7086a9df056602c8e0d9ae8fe17b028832d05f3d Author: Ben Dooks Date: Fri Jan 29 09:02:13 2010 +0000 ARM: SAMSUNG: Move map-base to plat-samsung Move the map-base file to plat-samsung. To make the move easier, we do not change the S3C_ prefix on many of the items as this would involve going through altering all the dependencies. Signed-off-by: Ben Dooks commit c116c1d7254348c7247ec4d7ab005dcc3f42565b Author: Ben Dooks Date: Fri Jan 29 09:02:12 2010 +0000 ARM: SAMSUNG: Move common headers from plat-s3c to plat-samsung Move common headers from plat-s3c's include/plat directory into plat-samsung. No need to fix any files, these are still included via Signed-off-by: Ben Dooks commit 7f0ff702cdf51472750f4b6042866f1b83a11215 Merge: d35b7a8 110d85a Author: Ben Dooks Date: Mon Feb 22 23:38:26 2010 +0000 ARM: Merge next-samsung-s3c64xx-platdeletion Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung Conflicts: arch/arm/mach-s3c64xx/Makefile (fixed) commit 110d85acd479b80dc11b7fa3abef63285da8ea0c Author: Ben Dooks Date: Mon Feb 22 23:26:47 2010 +0000 ARM: S3C64XX: Eliminate plat-s3c64xx Now we've move the support out of plat-s3c64xx for everything, eliminate the platform directory arch/arm/plat-s3c64xx and remove it from the ARM build configuration. Note, PLAT_S3C64XX is kept around for the moment until the drivers that depend on it can be updated, so it is moved to the mach-s3c64xx Kconfig. Signed-off-by: Ben Dooks commit 281ff33b7c1b1ba2a5f9b03425e5f692a94913fa Author: Suresh Siddha Date: Thu Feb 18 11:51:40 2010 -0800 x86_64, cpa: Don't work hard in preserving kernel 2M mappings when using 4K already We currently enforce the !RW mapping for the kernel mapping that maps holes between different text, rodata and data sections. However, kernel identity mappings will have different RWX permissions to the pages mapping to text and to the pages padding (which are freed) the text, rodata sections. Hence kernel identity mappings will be broken to smaller pages. For 64-bit, kernel text and kernel identity mappings are different, so we can enable protection checks that come with CONFIG_DEBUG_RODATA, as well as retain 2MB large page mappings for kernel text. Konrad reported a boot failure with the Linux Xen paravirt guest because of this. In this paravirt guest case, the kernel text mapping and the kernel identity mapping share the same page-table pages. Thus forcing the !RW mapping for some of the kernel mappings also cause the kernel identity mappings to be read-only resulting in the boot failure. Linux Xen paravirt guest also uses 4k mappings and don't use 2M mapping. Fix this issue and retain large page performance advantage for native kernels by not working hard and not enforcing !RW for the kernel text mapping, if the current mapping is already using small page mapping. Reported-by: Konrad Rzeszutek Wilk Signed-off-by: Suresh Siddha LKML-Reference: <1266522700.2909.34.camel@sbs-t61.sc.intel.com> Tested-by: Konrad Rzeszutek Wilk Cc: stable@kernel.org [2.6.32, 2.6.33] Signed-off-by: H. Peter Anvin commit 8cb3a2ebc19eef58bcbd5460c4fb463f30bc6459 Author: Kuninori Morimoto Date: Mon Feb 22 09:30:12 2010 +0000 ARM: mach-shmobile: ap4evb: Add S6 debug switch support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 5098280e015e36daebfd16f976ec3db6f4975fac Author: Kuninori Morimoto Date: Mon Feb 22 09:20:39 2010 +0000 ARM: mach-shmobile: ap4evb: Add LED support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 586f64c749a71fa2c86e1e2c121d22c8bc60669a Author: Jiri Kosina Date: Mon Feb 22 11:10:48 2010 +0100 Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed This is a partial revert of commit 3ad2f3fbb961 ("tree-wide: Assorted spelling fixes") as the change in arch/sparc/kernel/leon_kernel.c has been already fixed while refactoring the file in the sparc tree. Reported-by: Stephen Rothwell Signed-off-by: Jiri Kosina commit 992426bfe98e71db1ce767fd66f6c68ed18fcc14 Author: Ben Dooks Date: Sat Feb 20 23:01:33 2010 +0000 ARM: SAMSUNG: Remove dma-plat.h to allow plat-s3c64xx to be removed dma-plat.h is the last file left in plat-s3c64xx, but to remove it we must also change the use of dma-plat.h by the core code and the s3c24xx implementation. Rename the s3c24xx dma-plat.h in the common plat-samsung directory as it may be used for other ports. Move the specific dma bits into the mach-s3c64xx directory and update the build as needed. Signed-off-by: Ben Dooks commit 431fb7df24ebf360ba35895a60d084de364e39f8 Author: Ben Dooks Date: Fri Feb 5 13:52:53 2010 +0100 ARM: SAMSUNG: Move pm-core.h to machine directory Move the pm-core.h to the machine include directory in the process of eliminating the plat-s3c64xx. Signed-off-by: Ben Dooks commit 89f0ce721c0bc95c109300edcd8525d8ea5df8f2 Author: Ben Dooks Date: Tue Jan 26 15:49:15 2010 +0900 ARM: S3C64XX: Remove plat-s3c64xx Kconfig and PLAT_S3C64XX Remove the Kconfig and PLAT_S3C64XX defines for the previous S3C64XX directory structure now that the code is moved into mach-s3c64xx. Note, we cannot currently remove plat-s3c64xx directory as we have a pair of include files used within plat-s3c and plat-samsung that need to find a new home. Signed-off-by: Ben Dooks commit 55bf9267dd628c9369674ca75f5b00e275529289 Author: Ben Dooks Date: Tue Jan 26 15:10:38 2010 +0900 ARM: S3C64XX: Combine the clock init code Turn the init sequence of s3c24xx_register_baseclocks(xtal); s3c64xx_register_clocks(); s3c6400_register_clocks(S3C6410_CLKDIV0_ARM_MASK); into a single call as this is now contained within one file. Signed-off-by: Ben Dooks commit 62acb2f82dc27cd40729e7d4c2879e57fe41b927 Author: Ben Dooks Date: Tue Jan 26 14:53:19 2010 +0900 ARM: S3C64XX: Merge s3c6400-clock.c and clock.c into mach-s3c64xx Merge plat-s3c64xx/s3c6400-clock.c mach-s3c64xx/clock.c placing all the clock code into one place. Note, no effort is made in this patch to squash the init functions together. Signed-off-by: Ben Dooks commit 6ce8fde296e56cda9d7416e015ed2fe495c9c48c Author: Ben Dooks Date: Tue Jan 26 14:32:09 2010 +0900 ARM: S3C64XX: Merge s3c6400-init.c into cpu.c Since this file is small, and is compiled for both systems in this architecture merge it into the cpu support file and remove the original instead of moving it. Signed-off-by: Ben Dooks commit f7be9abaa5f4a64fdcca6808bb7eacb3547e574e Author: Ben Dooks Date: Tue Jan 26 13:41:30 2010 +0900 ARM: S3C64XX: Move core support to mach-s3c64xx Move the core S3C64XX support to mach-s3c64xx as it is unlikely to be used outside of this directory. Also move the SoC header files in with it. This includes the clock, cpu, cpufreq, dma, gpiolib and pll support. Signed-off-by: Ben Dooks commit 88fc68a280709f3fb9488986ab39eac330d17b6d Author: Ben Dooks Date: Tue Jan 26 11:19:18 2010 +0900 ARM: S3C64XX: Move device and device setup into mach-s3c64xx Move the S3C64XX specific device and setup files into mach-s3c64xx as they are unlikely to be used outside of this code. Signed-off-by: Ben Dooks commit ed618aff8a952f712caf1d475e0947a32a8b6606 Author: Ben Dooks Date: Tue Jan 26 11:07:23 2010 +0900 ARM: S3C64XX: Move IRQ support into mach-s3c64xx Move IRQ support to mach-s3c64xx as it is unlikely to be re-used outside this machine. Signed-off-by: Ben Dooks commit 3501c9ae9fc5414d09c9a8d3a5452d2b167db916 Author: Ben Dooks Date: Tue Jan 26 10:45:40 2010 +0900 ARM: S3C64XX: Move headers into machine include directory Move the register and GPIO definition files from plat-s3c64xx into the machine include direcotry as they are unlikely to be reused outside mach-s3c64xx. This move includes removing the empty and replacing it with the implementation. Signed-off-by: Ben Dooks commit b7e9f6219d01ccb4af6fe5ad082150032ecae8ab Author: Jiri Kosina Date: Fri Feb 19 00:44:42 2010 +0100 Remove drivers/parport/ChangeLog Remove outdated drivers/parport/ChangeLog. No need for such files since we have git. Acked-by: Alan Cox Signed-off-by: Jiri Kosina commit 1ef8a5be834117fa54db6cb595fc2d45c14a38cf Author: Jonathan Corbet Date: Thu Feb 18 09:52:00 2010 -0700 Remove drivers/char/ChangeLog The ChangeLog file under drivers/char is 30K of stuff dedicated to the mid-90's TTY exploits of Ted Ts'o; it has been updated once since 1998 - and that was in 2001. It's interesting history, but we don't normally carry that kind of history inline with the code. Let's remove it. Signed-off-by: Jonathan Corbet Acked-by: Alan Cox Acked-by: "Theodore Ts'o" Signed-off-by: Jiri Kosina commit 02624a17896036c663fd5992c22919af8dad93ed Author: Kuninori Morimoto Date: Thu Feb 18 17:58:19 2010 +0900 ARM: mach-shmobile: ap4evb: Add tiny document Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit b228b48e454007436a8e6ff1c6b6f4f6602fc45e Author: Kuninori Morimoto Date: Thu Feb 18 16:44:41 2010 +0900 ARM: mach-shmobile: ap4evb: Add SCIFA0 support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 0f547dc1f6e4faf05fd9946c6b7e9a828e7f901e Author: Baruch Siach Date: Wed Feb 17 12:33:25 2010 +0200 mx25pdk: add LCD support Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 04a03e5fe3d337242e5c0a9c93d2fd24cff545ef Author: Baruch Siach Date: Wed Feb 17 12:33:24 2010 +0200 mx25: add platform support for imxfb Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit f601441916d1e19291d0b4f044b4a7551e2924d0 Author: Baruch Siach Date: Wed Feb 17 12:33:23 2010 +0200 imxfb: add support for i.MX25 The commit also introduces the HAVE_FB_IMX config that is to be selected from the MX25 platform config. Once this commit gets merged, the two other i.MX archs, ARCH_MX1 and ARCH_MX2, should follow this one. Signed-off-by: Baruch Siach Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 1b7e0677fb1513605df327ae2987d17e0b2ae3ea Author: Kuninori Morimoto Date: Wed Feb 17 09:30:14 2010 +0000 ARM: mach-shmobile: SMSC 9220 support for AP4EVB. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit b789b3fdccc1690826331f4c878b644c3904ca6b Author: Kuninori Morimoto Date: Wed Feb 17 09:39:10 2010 +0000 ARM: mach-shmobile: Add sh7372 pinmux support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit cb2992a60b7e73fbabe9ffe54056eed0022f2ed2 Author: Mulyadi Santosa Date: Thu Feb 18 01:22:40 2010 +0700 doc: typo - Table 1-2 should refer to "status", not "statm" Fixes a typo in proc.txt documentation. Table 1-2 should refer to "status", not "statm" Signed-off-by: Mulyadi Santosa Signed-off-by: Jiri Kosina commit c13f3d378f77ce3176628ade452b0e461242faf3 Author: FUJITA Tomonori Date: Mon Feb 15 11:33:04 2010 +0900 x86/gart: Unexport gart_iommu_aperture I wrongly exported gart_iommu_aperture in the commit 42590a75019a50012f25a962246498dead428433. It's not necessary so let's unexport it. Signed-off-by: FUJITA Tomonori Cc: Joerg Roedel LKML-Reference: <20100215113241P.fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Ingo Molnar commit 94d32f99c6aba8b702a9cf78cb328aeb7882b1e5 Author: Andy Green Date: Mon Feb 1 13:28:54 2010 +0100 imx-serial-excessive-status-clearing-on-break.patch cc: Sasha Hauer We noticed that we were only able to communicate once with a GSM module per session, if we powered down the module then the serial driver was broken until reset, no traffic or /proc/interrupts activity could be seen any more. Volker noticed it was provoked by a long "break" seen on the wire when the RX was not driven during powerdown, we discovered we could kill the serial driver just by forcing RX low extenally for a little while. I saw that the processing for BREAK in the driver gets too excited and clears down all set bits in USR2, including that a character is pending. This stops all further characters getting processed. The attached one-liner makes the serial driver immortal against BREAK. Signed-off-by: Andy Green Signed-off-by: Volker Ernst Signed-off-by: Sascha Hauer commit 2f68ffd11aa76b251921976c982b814df9ebe890 Merge: 5601280 a602f0f Author: Russell King Date: Mon Feb 15 21:20:33 2010 +0000 Merge branch 'arm/clock-event' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel-stable commit 56012808f4d5606e401539f663d92009d964425b Merge: a814290 b2a731a Author: Russell King Date: Mon Feb 15 21:20:18 2010 +0000 Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable Conflicts: arch/arm/Makefile commit f0d3ab49110327516b7f0b6d27fd33d6fa079d6c Author: Uwe Kleine-König Date: Fri Feb 5 16:57:59 2010 +0100 arm/mx2: define seperate imx_nand devices for imx21 and imx27 As the NFC controller has different addresses on imx21 and imx27 there are two different devices needed if not relying on the overloaded cpp macro NFC_BASE_ADDR. So some cpp magic is added to minimize code duplication. As obviously these two defines need different names, the name of the old device is #defined to the new one when building for only one of imx21 or imx27. Signed-off-by: Uwe Kleine-König commit dfff0615d28bdb3e8d213e5537dd069265912667 Author: Uwe Kleine-König Date: Fri Feb 12 21:58:11 2010 +0100 tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments Signed-off-by: Uwe Kleine-König Signed-off-by: Jiri Kosina commit deded43508f065c95af506d18b8309ba842c397e Author: Kuninori Morimoto Date: Fri Feb 12 09:55:08 2010 +0000 ARM: mach-shmobile: intc-sh7372 tidyup This patch is based on Rev 0.5 manual Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit aa18ef609b65a76e4531b09dd0c196be3e04eb94 Author: NISHIMOTO Hiroki Date: Fri Feb 12 08:11:18 2010 +0000 ARM: mach-shmobile: G4EVM USBHS support Add G4EVM platform data and a magic setup sequence to initialize the r8a66597 block aka USBHS in sh7377. Signed-off-by: NISHIMOTO Hiroki Signed-off-by: Paul Mundt commit 276b4f623cfd30320c004269725683ba8f262bb6 Author: NISHIMOTO Hiroki Date: Fri Feb 12 08:10:06 2010 +0000 ARM: mach-shmobile: sh7377 and G4EVM pinmux support Add support for the sh 7377 pinmux using drivers/sh/pfc.c and some LEDs on G4EVM. Signed-off-by: NISHIMOTO Hiroki Signed-off-by: Paul Mundt commit 6b79b264ce04e2acd24330140e147801cdbaa39f Author: Jiri Kosina Date: Fri Feb 12 10:31:37 2010 +0100 No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h This is partial revert of commit 9404c9c392d5 ("Fix misspelling of "should" and "shouldn't" in comments"). According to Dave Airlie: "Can we drop any cleanups to atombios.h? This file comes from AMD and we normally drop it into place, so they just get overwritten next time." Reported-by: Dave Airlie Signed-off-by: Jiri Kosina commit 3a7b802d1a8c279876ec74094d71f3c6c45d8030 Author: Magnus Damm Date: Wed Feb 10 20:13:31 2010 +0900 ARM: mach-shmobile: G3EVM USBHS support Add G3EVM platform data and a magic setup sequence to initialize the r8a66597 block aka USBHS in sh7367. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 7fdda6780aaa21c7a94e09975649649bb0f4a932 Author: Magnus Damm Date: Wed Feb 10 20:10:55 2010 +0900 ARM: mach-shmobile: sh7367 and G3EVM pinmux support Add support for the sh7367 pinmux using drivers/sh/pfc.c and select serial console pins and some LEDs on G3EVM. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 5c42dc7070c94622ca914b5a2e227f3744e857e7 Author: Jean Delvare Date: Thu Feb 11 15:04:36 2010 +0100 devres/irq: Fix devm_irq_match comment Fix the reference (in comment). Signed-off-by: Jean Delvare Signed-off-by: Jiri Kosina commit b2a731aa5cbca7e0252da75e16de7ae5feb1313a Author: Laurie Bradshaw Date: Wed Feb 10 16:10:43 2010 +0000 [ARM] orion5x: D-link DNS-323 revision A1 power LED This patch fixes the power LED on DNS-323 revision A1, and adds timer support for (hopefully) both A1 and B1 revisions. Power LED on revision A1 is active low and also requires GPIO 4 to be low to work. Tested on my DNS-323 revision A1. I have set the default trigger to timer as that replicates the behaviour of the original firmware, userspace can change the trigger at the end of the boot process providing a useful indication that booting has completed. Signed-off-by: Nicolas Pitre commit eeb5b4ae81f4a750355fa0c15f4fea22fdf83be1 Author: Kevin Dankwardt Date: Wed Feb 10 23:43:40 2010 +0900 fat: Fix stat->f_namelen I found that the length of a file name when created cannot exceed 255 characters, yet, pathconf(), via statfs(), returns the maximum as 260. Signed-off-by: Kevin Dankwardt Signed-off-by: OGAWA Hirofumi commit e335c75cf32b7014f84c90bbe7ed9b7ecd8e7778 Author: Valentin Longchamp Date: Tue Feb 9 18:13:36 2010 +0100 mx31moboard: support for the smartbot baseboard This baseboard is used on the handbot and eybot robots. The sel gpios are used as enables and rst signals on smartbot, thus the sel init is moved from mx31moboard file to board files. Signed-off-by: Valentin Longchamp Signed-off-by: Sascha Hauer commit cda82f85c2bba92daa3d017f7c7bc5f8c61a2e11 Author: Valentin Longchamp Date: Tue Feb 9 18:13:35 2010 +0100 mx31moboard: make usbh2 enable gpio claim more atomic It is more cosmetic than fixing a real problem, but the code looks more logical like that Signed-off-by: Valentin Longchamp Signed-off-by: Sascha Hauer commit f8594c283e409024d817e75027074570ce27dcc5 Author: Valentin Longchamp Date: Tue Feb 9 18:13:34 2010 +0100 mx31moboard: change initial reset status for robot microcontollers We want the microcontrollers to be held in reset during kernel boot. We also set the turretcam as the default camera since it is present on all marxbots. Signed-off-by: Valentin Longchamp Signed-off-by: Sascha Hauer commit fed9b63ca5aa999e618140cc1cc6bd73f212ec9b Merge: d2831d1 3d48e1d Author: Sascha Hauer Date: Wed Feb 10 11:11:37 2010 +0100 Merge branch 'mx51-baseport-sascha' of git://kernel.ubuntu.com/amitk/mx51-upstream into mxc-master commit d2831d1f543489ef97a20e6e65f625e195b521bf Author: Sascha Hauer Date: Tue Feb 9 11:04:36 2010 +0100 i.MX pcm043: Add AC97 sound support Signed-off-by: Sascha Hauer commit c8a6885f2153087668b64d4ee25f78a7dda1dadb Author: Sascha Hauer Date: Mon Feb 8 16:42:28 2010 +0100 pca100: add sound support Signed-off-by: Sascha Hauer commit d9e557e5cb2052164f04af75c7d3d9bdd4111054 Author: Sascha Hauer Date: Tue Feb 9 10:48:16 2010 +0100 add ssi header file Signed-off-by: Sascha Hauer commit 1afeea84bd821e9a8c1c6606ba677bc229dd57de Author: Simon Guinot Date: Tue Feb 9 21:20:56 2010 +0100 [ARM] Kirkwood: define SATA LED for netspace_v2 This patch add a GPIO LED named "ns_v2:blue:sata" which can be used to enable or disable SATA activity LED blinking. Signed-off-by: Simon Guinot Signed-off-by: Nicolas Pitre commit ca9cea939932a0a64fee9d83b3c631431359446f Author: Simon Guinot Date: Tue Feb 9 21:20:55 2010 +0100 [ARM] Kirkwood: add LaCie Internet Space v2 support The Internet and Network Space v2 boards are very close. The only difference is that there is no USB type B plug wired on the Internet Space v2. Signed-off-by: Simon Guinot Signed-off-by: Nicolas Pitre commit 7a15726cb4aca67150b93a5ce5413efe6e87c95d Author: Simon Guinot Date: Tue Feb 9 21:21:50 2010 +0100 [ARM] Orion5x: enable SATA LED blinking for d2net Signed-off-by: Simon Guinot Signed-off-by: Nicolas Pitre commit d74b96a73a99853708d6b278c2ce683657fa1ec5 Author: Simon Guinot Date: Tue Feb 9 21:21:49 2010 +0100 [ARM] Orion5x: set valid GPIO inhibit power-off for d2net This patch allow user-space to configure the switch power-off behaviour via the gpiolib sysfs interface. Signed-off-by: Simon Guinot Signed-off-by: Nicolas Pitre commit 3d48e1d0e8701d004ce7e1dd66088f42e429d079 Author: Amit Kucheria Date: Thu Feb 4 15:57:29 2010 -0800 mxc: MAINTAINERS: Add maintainer for mach-mx5 Add self to MAINTAINERS for Freescale i.MX5 SoCs Signed-off-by: Amit Kucheria commit 51c23a04c39e6a95a37b8af8625a550e674ddef6 Author: Amit Kucheria Date: Fri Dec 4 00:57:20 2009 +0200 mxc: Add mx51_defconfig This config is used to test the base support for i.MX51 processors on the Babbage board Signed-off-by: Amit Kucheria commit b996b5830364c1b1d2469be574f4ebe831987ba9 Author: Amit Kucheria Date: Tue Feb 2 11:57:53 2010 -0800 mxc: Add support for the Babbage board (i.MX5) Babbage is a reference board from Freescale for their i.MX51 SoC. Add board definition, Kconfig and Makefiles to enable Freescale i.MX51 processor and Babbage board. Boot tested on a Babbage2.5 board Signed-off-by: Amit Kucheria commit a329b48c43e5e2e6b51ce159d99aefeb90c7c066 Author: Amit Kucheria Date: Thu Feb 4 12:21:53 2010 -0800 mxc: Core support for Freescale i.MX5 series Add basic clock support, cpu identification, I/O mapping, interrupt controller, serial port and ethernet. Signed-off-by: Amit Kucheria commit 438caa3f6c91ba21c539a8547c4075b619dc6500 Author: Amit Kucheria Date: Thu Feb 4 12:09:40 2010 -0800 mxc: changes to common plat-mxc code to add support for i.MX5 Prepare for i.MX5 SoC code by adding the relevant macros to common plat-mxc code. Signed-off-by: Amit Kucheria commit 0f3332c4fabb2227b1bc15dc7542017d08f10a09 Author: Sascha Hauer Date: Fri Dec 4 09:34:51 2009 +0100 mxc: refactor timer code to use timer versions Refactor the timer code into version 1 and version 2. Essentially there are 2 versions of the timer hardware on Freescale MXC hardware. Version 1 is found on MX1/MXL, MX21 and MX27. Version 2 is found on MX25, MX31, MX35, MX37, MX51, and future parts. Signed-off-by: Sascha Hauer Acked-by: Grant Likely Signed-off-by: Amit Kucheria commit a003708ad4ee9384226251431c7953a24079ff80 Author: Amit Kucheria Date: Thu Dec 3 22:36:41 2009 +0200 mxc: TrustZone interrupt controller (TZIC) for Freescale i.MX5 family Freescale i.MX51 processor uses a new interrupt controller. Add driver for TrustZone Interrupt Controller Signed-off-by: Amit Kucheria commit b80109e256bc17ed66c9d559175f087b03ca2a8e Author: Anton Blanchard Date: Tue Feb 9 15:07:40 2010 +1100 Remove reference to kthread_create_on_cpu kthread_create_on_cpu doesn't exist so update a comment in kthread.c to reflect this. Signed-off-by: Anton Blanchard Acked-by: Rusty Russell Signed-off-by: Jiri Kosina commit 3ad2f3fbb961429d2aa627465ae4829758bc7e07 Author: Daniel Mack Date: Wed Feb 3 08:01:28 2010 +0800 tree-wide: Assorted spelling fixes In particular, several occurances of funny versions of 'success', 'unknown', 'therefore', 'acknowledge', 'argument', 'achieve', 'address', 'beginning', 'desirable', 'separate' and 'necessary' are fixed. Signed-off-by: Daniel Mack Cc: Joe Perches Cc: Junio C Hamano Signed-off-by: Jiri Kosina commit e4e430c611db75f58d3ca33869e182a530859426 Author: Magnus Damm Date: Tue Feb 9 03:36:03 2010 +0000 ARM: mach-shmobile: sh7372 INTCA support Add support for the sh7372 INTCA hardware block. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 6673be73809c8aa1ca5255c83f4fc85c43fdbfab Author: Magnus Damm Date: Tue Feb 9 03:35:53 2010 +0000 ARM: mach-shmobile: sh7377 INTCA support Add support for the sh7377 INTCA hardware block. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit f8eef1305b33438dd7a3a01e43b94e57ca87fc9b Author: Magnus Damm Date: Tue Feb 9 03:35:42 2010 +0000 ARM: mach-shmobile: sh7367 INTCA support Add support for the sh7367 INTCA hardware block. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 4ae04acb81256719a71125c0f0280e2a3ad68e25 Author: Magnus Damm Date: Mon Feb 8 11:02:54 2010 +0000 ARM: mach-shmobile: early console support using earlyprintk Add support for early console to the SH-Mobile boards. Simply perform an early platform probe for "earlyprintk" to trigger the early serial console code in sh-sci.c. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 62f60d6a37910501814c6281e6c21b485434a7f1 Author: Magnus Damm Date: Mon Feb 8 10:53:13 2010 +0000 ARM: mach-shmobile: optimize get_irqnr_preamble/and_base macros Optimize the SH-Mobile interrupt assembly macros to avoid reloading the INTFLGA register address in case of multiple pending interrupts. Kindly pointed out by Russell King. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 58152a16901dfce8662f5ec7e16d06dfce6fd31e Author: Uwe Kleine-König Date: Fri Feb 5 11:42:54 2010 +0100 arm/mx2/devices: use SoC-prefixed names where possible There is only NFC_BASE_ADDR left which is defined differently for mx21 and mx27. Signed-off-by: Uwe Kleine-König commit 69ddb488035068fce9a4ac4a63cffa91dfb3f37f Author: Uwe Kleine-König Date: Fri Feb 5 12:03:37 2010 +0100 arm/mx2: use cpp magic to create imx-ssi devices This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König commit ccd0e42c827666e91296b6395b7b7b04fb8c8803 Author: Uwe Kleine-König Date: Fri Feb 5 10:46:56 2010 +0100 arm/mx2: use cpp magic to create imx-mmc devices This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König commit 9309b2ba54d9082b8eb2ce641ad395cf5d9929f4 Author: Uwe Kleine-König Date: Thu Feb 4 22:13:52 2010 +0100 arm/mx2: use cpp magic to create imx-i2c devices This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König commit 2b84a3640ffdebbbea3ec004eae963e920c16e1a Author: Uwe Kleine-König Date: Thu Feb 4 14:11:02 2010 +0100 arm/mx2: use cpp magic to create imx_gpt devices This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König commit 68c94b40b31926f627573a7f656b903f6644744e Author: Uwe Kleine-König Date: Thu Feb 4 22:04:32 2010 +0100 arm/mx2: use cpp magic to create spi_imx devices This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König commit 34bf0fc54a4634ebb0a992e8562191a01233e240 Author: Magnus Damm Date: Mon Feb 8 03:35:46 2010 +0000 ARM: mach-shmobile: G3EVM, G4EVM and AP4EVB defconfigs Add defconfigs for G3EVM, G4EVM and AP4EVB. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit d48d38e87c2ce56dcee030a8bcd5e9e1090c232f Author: Paul Mundt Date: Mon Feb 8 12:50:24 2010 +0900 MAINTAINERS: Add entry for ARM-based SH-Mobile architecture. Signed-off-by: Paul Mundt commit 8a77b8d0744ab21b59a9413c41c6a3d6cb9b0b4f Author: Magnus Damm Date: Fri Feb 5 11:15:33 2010 +0000 serial: sh-sci: Support ARM-based SH-Mobile CPUs. Add support for ARM-based SH-Mobile CPUs to the sh-sci driver. Also remove the SCLSR register that is missing on sh772x, sh7705 and SH-Mobile. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 65a5b28f0af00dddd785b516914739460562638f Author: Magnus Damm Date: Fri Feb 5 11:15:25 2010 +0000 sh: Let INTC set IRQF_VALID on ARM platforms. Reuse the SuperH INTC code on ARM by using set_irq_flags() to set IRQF_VALID on ARM platforms. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 13d605de2ece8c8f7c17a88747d90b7931350ee5 Author: Magnus Damm Date: Fri Feb 5 11:15:15 2010 +0000 sh: Build drivers/sh for ARM-based SH-Mobile CPUs. Build drivers/sh in the case of ARM-based SH-Mobile CPUs. Shared code for the interrupt controller (INTC) and the gpio/pinmux (PFC) is located there. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 2b7eda63e489a43575f776a1a32bcfbcd75b9476 Author: Magnus Damm Date: Fri Feb 5 11:14:58 2010 +0000 ARM: mach-shmobile: SH-Mobile AP4 support. This adds preliminary support for the SH7372 (SH-Mobile AP4) CPU and the AP4EVB reference board. Only timer, serial console and NOR flash are supported at this point. Support for the interrupt controller, pinmux support, clock framework and runtime pm will be submitted as feature patches on top of this. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit f2aaf66df0858116b2fcdbbfe8126d4ff925ac61 Author: Magnus Damm Date: Fri Feb 5 11:15:07 2010 +0000 ARM: mach-shmobile: SH-Mobile G4 support. This adds preliminary support for the SH7377 (SH-Mobile G4) CPU and the G4EVM reference board. Only timer, serial console and NOR flash are supported at this point. Support for the interrupt controller, pinmux support, clock framework and runtime pm will be submitted as feature patches on top of this. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit c793c1b0c8ea11b46caf5a532752214b27a2df42 Author: Magnus Damm Date: Fri Feb 5 11:14:49 2010 +0000 ARM: mach-shmobile: SH-Mobile G3 support. This adds preliminary support for the SH-Mobile G-series. The SH-Mobile G-series is a series of ARM/SH multi-core CPUs that aside from the ARM MPU are primarily composed of existing SH IP blocks. This includes initial support for the SH7367 (SH-Mobile G3) CPU and the G3EVM reference board. Only timer, serial console, and NOR flash are supported at this point. Patches for the interrupt controller, pinmux support, clock framework and runtime pm will be submitted as feature patches on top of this. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 1537a3638cbf741d3826c1002026cce487a6bee0 Author: Daniel Mack Date: Fri Jan 29 15:57:49 2010 +0800 tree-wide: fix 'lenght' typo in comments and code Some misspelled occurences of 'octet' and some comments were also fixed as I was on it. Signed-off-by: Daniel Mack Cc: Jiri Kosina Cc: Joe Perches Cc: Junio C Hamano Signed-off-by: Jiri Kosina commit b5218a87cbe0f01d551b2dae90b54cad8ded72df Author: Pavel Roskin Date: Tue Jan 19 13:25:50 2010 +0100 drm/kms: fix spelling in error message Signed-off-by: Pavel Roskin [clemens@ladisch.de: merged into drm_fb_helper] Signed-off-by: Clemens Ladisch Signed-off-by: Jiri Kosina commit a64061e100826be758145462f8c656ba17c9541b Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:26:47 2010 -0200 doc: capitalization and other minor fixes in pnp doc Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit 9ce8e498ee58bb8a866a6c3c08fcb385ed66e9d2 Author: Baruch Siach Date: Tue Feb 2 08:54:51 2010 +0200 devres: typo fix s/dev/devm/ Signed-off-by: Baruch Siach Signed-off-by: Jiri Kosina commit 350f82586b7554240bee18c41cc5c842f63265ae Author: Edward Z. Yang Date: Mon Feb 1 18:26:59 2010 -0500 Remove redundant trailing semicolons from macros Signed-off-by: Edward Z. Yang Acked-by: Rusty Russell Signed-off-by: Jiri Kosina commit 7d9b48ea81ee49779b95ecd0df5a8c2789e4f836 Author: Uwe Kleine-König Date: Thu Jan 28 22:09:43 2010 +0100 fix typo "definetly" -> "definitely" in comment Signed-off-by: Uwe Kleine-König Signed-off-by: Jiri Kosina commit 551e378ca1852dc51609b722014416d4da0770c6 Author: Daniel Mack Date: Thu Jan 28 16:11:51 2010 +0800 tree-wide: s/widht/width/g typo in comments Signed-off-by: Daniel Mack Cc: Jiri Kosina Signed-off-by: Jiri Kosina commit d9a5f04b6a8e0e681ae37fde84016a57ca17371f Author: Shahar Havivi Date: Wed Jan 27 10:18:28 2010 +0100 vt: remove unused variables Remove unused fields in drivers/char/vt.c variables orig_buf and orig_count are assigned but never used. Signed-off-by: Shahar Havivi Signed-off-by: Jiri Kosina commit 7dd607e82d823e40675b0b87f035ff04dcb0b5c0 Author: Jiri Kosina Date: Wed Jan 27 01:00:10 2010 +0100 crypto: fix typo in Kconfig help text Reported-by: Toralf Förster Signed-off-by: Jiri Kosina commit 5e39df5625fb903587ac8e281fa57d76714996e4 Author: Uwe Kleine-König Date: Mon Jan 25 21:38:09 2010 +0100 grammar fix in comment Signed-off-by: Uwe Kleine-König Cc: Nicolas Pitre Signed-off-by: Jiri Kosina commit 9ddc5b6f18fbac07d2746566b73b89e89fdd4e6a Author: Uwe Kleine-König Date: Wed Jan 20 17:02:24 2010 +0100 tree-wide: fix typos "ammount" -> "amount" Signed-off-by: Uwe Kleine-König Signed-off-by: Jiri Kosina commit 659431fcafd820cc426afedadcc4548933224985 Author: Uwe Kleine-König Date: Mon Jan 18 16:02:48 2010 +0100 fix typos "precidence" -> "precedence" in comments This patch was generated by git grep -E -i -l 'precidence' | xargs -r perl -p -i -e 's/precidence/precedence/' Signed-off-by: Uwe Kleine-König Signed-off-by: Jiri Kosina commit 3333e9ee9f8b82307f99fb8466724649da573025 Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:27:32 2010 -0200 doc: fix Defaultd -> Defaults typo in EISA doc Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit 19afd8e2ffd7a6e4026d51d63495e14d2a7bacc3 Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 18:30:05 2010 -0200 doc: update 00-INDEX for Documentation/laptops/ Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit 2273130de8b24adeb59231a9a8c6274bf5d35447 Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:23:14 2010 -0200 fix comment typo leve -> level in powerpc Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit de8164fb2242d77c8a83fb3c63830eb7914d696d Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:22:28 2010 -0200 doc: fix leve -> level typo in pm-runtime doc Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit af66585270ef99aa6097faf3bd7344855077e75d Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:14:26 2010 -0200 fix comment typo boo -> boot in ksysfs.c Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit d6b198bc8a67deee5984fb9506f000ae4fce9d75 Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:10:07 2010 -0200 fix ext3/ext4 comment typo compain -> complain Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit db18efac0bd644e4b7af757394ca0bef8d91dcee Author: Jaak Ristioja Date: Fri Jan 15 12:05:07 2010 +0200 bio: Fix outdated comment about bio_alloc_bioset() In commit 451a9ebf653d28337ba53ed5b4b70b0b9543cca1 bio_alloc_bioset() was refactored not to take NULL as a valid argument for bs. This patch changes the comment for that function accordingly. Currently, passing NULL as argument to parameter bs would result in a NULL pointer dereference. Signed-off-by: Jaak Ristioja Signed-off-by: Jiri Kosina commit 6382dc334064bb0b41a95df0e3c438de35f2ffb7 Author: Justin P. Mattock Date: Thu Jan 14 23:03:18 2010 -0800 fix comment typos in avc.c Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina commit fb637f3cd31783db2b654842ea32ffec15c4bd62 Author: Justin P. Mattock Date: Thu Jan 14 22:16:16 2010 -0800 fix comment typo in pci-dma.c Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina commit 0747e3bc54b43faaa88ab0b37eb5b6f50972965b Author: Stefan Weil Date: Thu Jan 7 00:44:08 2010 +0100 Fix spelling of 'platform' in log messages Replace platfrom -> platform. Signed-off-by: Stefan Weil Signed-off-by: Jiri Kosina commit 947af2943576400628bba085eaa6b85143526133 Author: Stefan Weil Date: Thu Jan 7 00:03:52 2010 +0100 Fix spelling of 'platform' in comments and doc Replace platfrom -> platform. This is a frequent spelling bug. Signed-off-by: Stefan Weil Signed-off-by: Jiri Kosina commit 3d956d1dfffef3b19d743aa1a443ab5a300051cb Author: Peter Huewe Date: Tue Dec 22 09:41:42 2009 +0100 isdn/mISDN: add __init/__exit macros to dsp_core.c Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of drivers/isdn/mISDN/dsp_core.c Signed-off-by: Peter Huewe Signed-off-by: Jiri Kosina commit 60c14a1507a9fcd2e3b8eb53c218cb74ae404bcf Author: Peter Huewe Date: Tue Dec 22 09:38:14 2009 +0100 media/dvb: add __init/__exit macros to bt878.c Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of drivers/media/dvb/bt8xx/bt878.c Signed-off-by: Peter Huewe Acked-by: Jean Delvare Signed-off-by: Jiri Kosina commit 73a98fce881c46eaeb33c1aef23ab607f4d03344 Author: Peter Huewe Date: Tue Dec 22 09:38:02 2009 +0100 w1: add __init/__exit macros to w1.c Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of drivers/w1/w1.c Signed-off-by: Peter Huewe Signed-off-by: Jiri Kosina commit 8885074038b219b90cb0f5cd1a049ba80c7e815b Author: Peter Huewe Date: Tue Dec 22 09:27:06 2009 +0100 isdn/hardware: add __init/__exit macros to mISDNisar.c Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of drivers/isdn/hardware/mISDN/mISDNisar.c Signed-off-by: Peter Huewe Signed-off-by: Jiri Kosina commit 71709247aa852b5c4a01e70a9186590800d15575 Author: Robert P. J. Day Date: Mon Dec 28 11:50:29 2009 -0500 xen: Fix misspelled CONFIG variable in comment. Signed-off-by: Robert P. J. Day Signed-off-by: Jiri Kosina commit 473a72a18bf446f51837f7731214db297981f0ed Author: Peter Huewe Date: Tue Dec 22 09:27:05 2009 +0100 uwb/i1480: add __init/__exit macros Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of uwb/i1480/i1480-est.c Signed-off-by: Peter Huewe Acked-by: David Vrabel Signed-off-by: Jiri Kosina commit c9404c9c392d557a4687c4cbda022b03cb787ce9 Author: Adam Buchbinder Date: Fri Dec 18 15:40:42 2009 -0500 Fix misspelling of "should" and "shouldn't" in comments. Some comments misspell "should" or "shouldn't"; this fixes them. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit 634bad68bc25753816594ecd390dcea980528315 Author: Adam Buchbinder Date: Fri Dec 18 15:40:41 2009 -0500 Fix misspelling of "successful" and variants in comments. Some comments misspell "successful" or variants of the word; this fixes them. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit e233230f9c8f02d4c3a643ec5067ca21bc90ee9a Author: Nicolas Pitre Date: Fri Feb 5 00:24:33 2010 -0500 [ARM] orion5x: update defconfig Signed-off-by: Nicolas Pitre commit f123560a07313218108d3cc652af99eaaf04d67f Author: Nicolas Pitre Date: Thu Feb 4 23:27:23 2010 -0500 [ARM] Kirkwood: update defconfig Signed-off-by: Nicolas Pitre commit 1961528959aa523a351b49236f8627b30793ee80 Author: Nicolas Pitre Date: Fri Feb 5 00:20:24 2010 -0500 [ARM] orion5x: fix some improper includes in Linkstation files ... and replace misuse of arch_reset() with arm_machine_restart(). Signed-off-by: Nicolas Pitre commit 2d18638ec010a2ed1daa08b4774ed12108647a53 Author: Zhu Qingsen Date: Thu Feb 4 19:33:27 2010 -0800 [ARM] Orion: Add Buffalo Linkstation LS-HGL support Signed-off-by: Zhu Qingsen Signed-off-by: Nicolas Pitre commit b2fdb5660fccc060e47658baad8911a963397ced Author: Alexander Clouter Date: Mon Jan 18 23:38:19 2010 +0000 [ARM] kirkwood: combine support for openrd base/client support Inspired by the mach-ep93xx flattening work, there is really not much difference between the OpenRD base and client board support so they should be merged together. Signed-off-by: Alexander Clouter Acked-by: Simon Kagstrom Signed-off-by: Nicolas Pitre commit 639b9be60ec2045a0a59b2ea33479937c4b5acef Author: H Hartley Sweeten Date: Fri Jan 29 15:30:53 2010 -0700 mach-dove/common.c: remove unnecessary (void *) casts The (void *) cast is not needed when setting dev.platform_data to the address of the data. Remove the casts. Signed-off-by: H Hartley Sweeten Signed-off-by: Nicolas Pitre commit 3e3e65fc425588a4a4b9143d7dfe40e52a2bf0be Author: H Hartley Sweeten Date: Fri Jan 29 14:43:52 2010 -0800 mach-kirkwood/common.c: remove unnecessary (void *) casts The (void *) cast is not needed when setting dev.platform_data to the address of the data. Remove the casts. Signed-off-by: H Hartley Sweeten Cc: Lennert Buytenhek Signed-off-by: Nicolas Pitre commit ef4a6777cf33c4a7a76e74ecd593f74a1df30b96 Author: H Hartley Sweeten Date: Fri Jan 29 14:56:58 2010 -0800 mach-orion5x/common.c: remove unnecessary (void *) casts The (void *) cast is not needed when setting dev.platform_data to the address of the data. Remove the casts. Signed-off-by: H Hartley Sweeten Cc: Lennert Buytenhek Signed-off-by: Nicolas Pitre commit cb2dc111b156eb41f61ed4e5b3a3a5df90526d9d Author: Sascha Hauer Date: Thu Feb 4 14:32:53 2010 +0100 i.MX27 pca100: Add USB support Signed-off-by: Sascha Hauer commit ee14373cdc91fbc9ad8db0bf38e28d58f577b181 Author: Sascha Hauer Date: Thu Feb 4 09:32:44 2010 +0100 i.MX31 pcm037: Add USB support Signed-off-by: Sascha Hauer commit 773f206b2f3745bde8ee17ec0f884c19db3917a5 Author: Sascha Hauer Date: Wed Feb 3 17:13:41 2010 +0100 i.MX27 pcm038: Add USB support Signed-off-by: Sascha Hauer commit eee7c497d250bbb2bfd0fdc2b41b9b6ff02148a2 Author: Sascha Hauer Date: Wed Feb 3 17:13:29 2010 +0100 i.MX27 pca100: Add USB support Signed-off-by: Sascha Hauer commit d186f04c17d86e587e72bc402302df56a9b820f3 Author: Sascha Hauer Date: Thu Feb 4 14:34:48 2010 +0100 i.MX35: Add USB control register access support Signed-off-by: Sascha Hauer Cc: Daniel Mack commit 9cf945cbef42a4524b6a58486bd8bfb96640e97f Author: Sascha Hauer Date: Thu Feb 4 14:45:41 2010 +0100 i.MX27: Add USB control register access support Signed-off-by: Sascha Hauer Cc: Daniel Mack commit 84ab80616b0eb5fac4d1970f10ea1b3cf75280e1 Author: Sascha Hauer Date: Thu Feb 4 14:45:11 2010 +0100 i.MX ehci platform support: Some fixes - The SIC mask is only 2bits wide, not 4 - MX31_OTG_PM_BIT and MX31_H1_PM_BIT use negative logic - clear MX31_H1_DT_BIT and MX31_H2_DT_BIT so that they can be cleared, not only set. - return -EINVAL if called with an invalid controller number Signed-off-by: Sascha Hauer Cc: Daniel Mack commit ba593e5966440deec8684863e0cba9b502c4a377 Author: Sascha Hauer Date: Thu Feb 4 14:40:59 2010 +0100 fsl_mx3_udc: Add i.MX35 support The i.MX35 works fine with this driver, but we do not have the usb_ahb clock. Signed-off-by: Sascha Hauer Cc: Guennadi Liakhovetski commit e34b7005e5f55a55964c13ec9784e8e2b427a83c Author: Jasper Spaans Date: Fri Nov 20 14:20:05 2009 +0100 arch/x86/kernel/apic/apic_flat_64.c: Make comment match the code Make the comment match the code, this also holds for intel systems, according to probe_64.c in the same directory. Signed-off-by: Jasper Spaans Signed-off-by: Jiri Kosina commit 5d93a14241bf5ba299422440bc366ec43970c002 Author: Shaun Patterson Date: Sat Dec 5 22:30:52 2009 -0500 vmiclock: fix comment spelling mistake Signed-off-by: Shaun Patterson Signed-off-by: Jiri Kosina commit 640462cbd659990bcceaf86ab17ccbc02147e62a Author: Rudy Matela Date: Wed Dec 9 11:35:40 2009 -0300 Coding style correction of some wan drivers Added a space separating some if/switch/while keywords from the following parenthesis to conform to the CodingStyle. Signed-off-by: Rudy Matela Acked-by: Krzysztof Halasa Signed-off-by: Jiri Kosina commit 7e2a10836c0455cb3ca397f89b8280496148d571 Author: Julia Lawall Date: Thu Nov 12 23:08:36 2009 +0100 fs/qnx4: decrement sizeof size in strncmp As an identical match is wanted in this case, strcmp can be used instead. The semantic match that lead to detecting this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression foo; constant char *abc; @@ *strncmp(foo, abc, sizeof(abc)) // Signed-off-by: Julia Lawall Signed-off-by: Anders Larsen Signed-off-by: Jiri Kosina commit fe9a2302230fa287715a11a3d3aec74eec75a6a4 Author: Ali Gholami Rudi Date: Sun Nov 8 19:29:23 2009 +0330 doc: fix checking socket() in net tstamp example Signed-off-by: Ali Gholami Rudi Acked-by: Patrick Ohly Signed-off-by: Jiri Kosina commit edf86baae2e92bc03615086b2a341cd6d56c20f2 Author: Adam Buchbinder Date: Fri Dec 11 16:35:41 2009 -0500 Fix misspellings of "separate" in strings. Some string messages misspell "separate"; this fixes them. No change in functionality. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit 2a61aa401638529cd4231f6106980d307fba98fa Author: Adam Buchbinder Date: Fri Dec 11 16:35:40 2009 -0500 Fix misspellings of "invocation" in comments. Some comments misspell "invocation"; this fixes them. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit c41b20e721ea4f6f20f66a66e7f0c3c97a2ca9c2 Author: Adam Buchbinder Date: Fri Dec 11 16:35:39 2009 -0500 Fix misspellings of "truly" in comments. Some comments misspell "truly"; this fixes them. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit a089377f29d3af0f62f3bdc6db0c5042513fc3f3 Author: Adam Buchbinder Date: Fri Dec 11 16:35:38 2009 -0500 Fix misspelling of "truly" in a label. A label reads 'truely_dead' rather than 'truly_dead'; this fixes it. No change in functionality. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit 303863f43fa5106637325a213717b2f306e2efc3 Author: Adam Buchbinder Date: Fri Dec 11 16:35:37 2009 -0500 Fix a grammar error (redundant "be") in comment Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit c14e522b1aab6a1a3765db182aacca4f359f6d91 Author: Sebastian Andrzej Siewior Date: Wed Dec 16 23:13:44 2009 +0100 tree wide: remove execute flag from .c files Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Jiri Kosina commit c5c7b32d3c67049ab4e509d0e8bf93811c433dfb Author: Geert Uytterhoeven Date: Sun Dec 13 20:07:31 2009 +0100 ataflop: Killl warning about unused variable flags After commit e0c0978699a83f26f2341f7eedc1463b79e31aff ("ataflop: remove buggy/commented-out IRQ disable from do_fd_request()") the `flags' variable became unused: drivers/block/ataflop.c:1473: warning: unused variable 'flags' Hence remove it. Signed-off-by: Geert Uytterhoeven Signed-off-by: Jiri Kosina commit 9fd96bbb6a3a1fd9ba24e84a2d7ccc6ccb6beb60 Merge: 5c17ef8 e27bf72 Author: Sascha Hauer Date: Thu Feb 4 11:18:09 2010 +0100 Merge branch 'imx/master' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master commit 5c17ef878fa25e04b1e8f1d8f5fa8b267753472c Author: Roel Kluin Date: Wed Feb 3 20:19:00 2010 +0100 MX1/MX2: -EINVAL overwritten in second iteration in mxc_gpio_setup_multiple_pins() Due to the `ret = gpio_request()' below in the loop, the initial -EINVAL value of ret is overwritten. Signed-off-by: Roel Kluin Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit d35b7a829a13b69c4747b69380b504b6544a2375 Merge: 28db4ed 84c9b72 Author: Ben Dooks Date: Wed Feb 3 01:56:07 2010 +0000 ARM: Merge next-samsung-s3c244x-merge Merge branch 'next-samsung-s3c244x-merge' into next-samsung commit 28db4ed52d329ca06da9fbcc9dcf6c4e25cdcac2 Merge: 87aef30 91492b4 Author: Ben Dooks Date: Wed Feb 3 01:55:39 2010 +0000 ARM: Merge next-samsung-devupdates2 Merge branch 'next-samsung-devupdates2' into next-samsung commit 91492b4a04586e7cb191c72de9d1b22545a3ce16 Author: Maurus Cuelenaere Date: Sat Jan 30 18:01:48 2010 +0100 ARM: SAMSUNG: Add support for 12bit ADC The S3C64XX SoC series support 12bit ADC data, enable this and mask the data accordingly. Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit cf9814eb6d83f066d5db63f4144598e9c6ca2951 Author: Ben Dooks Date: Fri Jan 29 13:03:34 2010 +0900 ARM: S3C64XX: Make audio device code built unconditionally Making the code depend on CONFIG_SND_S3C24XX_SOC means that if the ASoC code is build modularily, the boards will fail to link due to the device code also being built as a module. As per Mark Brown's suggestions, just compile this always as it is expected many machines will have audio. Also move the obj-y line out of the device setup area into a new area just for devices. Signed-off-by: Ben Dooks commit 1de203adf6210b9dd81d907ea8cda587bc61cf4c Author: Ben Dooks Date: Fri Jan 29 10:53:35 2010 +0900 ARM: SAMSUNG: Use PLAT_SAMSUNG instead of PLAT_S3C As part of the development process, it is hoped PLAT_S3C is either removed from all of the PLAT_SAMSUNG derived platforms or removed entirely. It is also better to use PLAT_SAMSUNG as this is the current base of all Samsung devices. Change the two places that use PLAT_S3C to use PLAT_SAMSUNG Signed-off-by: Ben Dooks commit 3bd9377e8761cb7f1000b3075763df779ab9aeca Author: Ben Dooks Date: Fri Jan 29 10:52:02 2010 +0900 ARM: SAMSUNG: Add SERIAL_SAMSUNG_UARTS_4 Kconfig option Add SERIAL_SAMSUNG_UARTS_4 to mop up the number of cases currently using four Samsung compatible UARTS. Signed-off-by: Ben Dooks commit 21030403209f0c253d462492f881c613bd8eeda2 Author: Michel Pollet Date: Wed Jan 27 16:38:08 2010 +0000 ARM: S3C2412: SoC has the fractional baud rate register The S3C2412 has a fractional baud rate register, this patch adds the corresponding flag to the UART definition to allow generation of more precise baud rates for the various clock combinations. Signed-off-by: Michel Pollet Signed-off-by: Ben Dooks commit 4b4c662571bb3a19d6bacb4433886ec35c7093fa Author: Jassi Brar Date: Thu Jan 28 17:14:49 2010 +0900 ARM: S3C64XX: SPI: Make platform device compilation selectable The SPI controller platform devices should be compiled in independent of the driver support, otherwise we might end up with dev-spi built as kernel module. Change this to make every machine select if it has some SPI device and wants to build device definitions. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 2848552cef6a14fe4e54e676a61a340c8fd023b3 Author: Ben Dooks Date: Wed Jan 27 18:13:59 2010 +0900 ARM: SAMSUNG: Add DMA masks to hsotg device Add the required DMA masks to the hs-otg device definition to allow DMA to work with it. Signed-off-by: Ben Dooks commit e27bf72465f4d867a2aea33cad5e9e255c4d92ff Author: Uwe Kleine-König Date: Sat Jan 30 16:23:51 2010 +0100 imx/mx25: rename files defining a machine to mach-$mach.c Signed-off-by: Uwe Kleine-König commit 34101237d975ba37d19cbfe9318984af78332816 Author: Uwe Kleine-König Date: Fri Jan 29 17:36:05 2010 +0100 imx: define per SOC ..._PHYS_OFFSET and use these in favour of PHYS_OFFSET This is a further step in allowing to build a kernel image for more than one imx SOC. Signed-off-by: Uwe Kleine-König commit 7fc06d8c24fb7915d9cebc9aad7d3b40d8a6ef0b Author: Uwe Kleine-König Date: Fri Jan 15 10:13:30 2010 +0100 imx2x: convert serial.c to use soc-prefixed constants This makes the file compilable for a kernel that supports both imx21 and imx27. Signed-off-by: Uwe Kleine-König commit 08f9bf167c2729b46920fdef459787667ee68130 Author: Uwe Kleine-König Date: Thu Jan 14 22:04:49 2010 +0100 mxc91231: redefine MXC91231_IO_ADDRESS using IMX_IO_ADDRESS This simplifies the macro and makes is similar to the other ..._IO_ADDRESS macros defined for imx SOCs. Signed-off-by: Uwe Kleine-König commit 9ea07ec05e8030f6b4e12c4a41a9d633c0ccb618 Author: Uwe Kleine-König Date: Wed Jan 13 18:07:11 2010 +0100 mxc91231: use MXC91231_IO_ADDRESS instead of MXC91231_AIPS1_IO_ADDRESS Apart from MXC91231_IO_ADDRESS itself this was the only usage of MXC91231_AIPS1_IO_ADDRESS. Now MXC91231_IO_ADDRESS can be recoded with IMX_IO_ADDRESS and all helper macros can go away. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Fabio Estevam Cc: Daniel Schaeffer Cc: Alberto Panizzo Cc: Ivo Clarysse commit 8ac5b7c5ec8d46ad273d37aaa0d6e1f9cd2b01d9 Author: Uwe Kleine-König Date: Wed Jan 13 17:58:04 2010 +0100 imx: WARN in clk_disable if the clock isn't enabled Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King commit 84c9b7271a0af08c4e5fce3901a0ad3d952036bc Author: Ben Dooks Date: Tue Jan 26 16:54:21 2010 +0900 ARM: S3C244X: Merge plat-s3c24xx s3c2440.h and s3c2442.h into s3c244x.h Merge these two headers into one, these two SoCs are so similar. Note, correct fault in mach-smdk2443.h including the wrong header. Signed-off-by: Ben Dooks commit 58bac7b8ded70c39bcd5f7037091051c277618aa Author: Ben Dooks Date: Tue Jan 26 16:47:41 2010 +0900 ARM: S3C24XX: Move S3C2440/S3C2442 plat-s3c24xx support to mach-s3c2440 Remove the old common S3C2440 and S3C2442 SoC support from plat-s3c24xx into mach-s3c2440 now this directory is serving both SoCs. Signed-off-by: Ben Dooks commit 70556b143ae4cf404a73c2461a6bf7fef3fefbf7 Author: Ben Dooks Date: Tue Jan 26 16:37:50 2010 +0900 ARM: S3C24XX: Remove old mach-s3c2442 Remove the old mach-s3c2442 directory now all is merged into mach-s3c2440 and remove it from the arch/arm build process. Signed-off-by: Ben Dooks commit 916ee9249a7f19d8eb18cc9ee16ca495a517ab34 Author: Ben Dooks Date: Tue Jan 26 16:31:32 2010 +0900 ARM: S3C244X: Move S3C2442 code into S3C2440 Move the remaining S3C2442 code into mach-s3c2440 as there is only one file currently in there and these two SoCs are very similar. Signed-off-by: Ben Dooks commit 1f51bbfd5905b8c860cc95ae10c20e0844d0ade8 Author: Ben Dooks Date: Tue Jan 26 16:27:08 2010 +0900 ARM: S3C2440: Fix SMDK2440 SoC selection Fix the entries for SMDK2440 should have allowed for S3C2440 or S3C2440 SoC selection but this depended on ARCH_S3C2440 which has not been around for a while. Remove the dependency to allow this to be selected. Signed-off-by: Ben Dooks commit 491547d43bc2393de914b5ad18b6f5219107f918 Author: Ben Dooks Date: Tue Jan 26 16:13:35 2010 +0900 ARM: S3C2442: Merge s3c2442.c and clock.c Merge s3c2442.c and clock.c as the s3c242.c does not contain much and the clock parts are always built for s3c2442 anyway. Signed-off-by: Ben Dooks commit 5cbcccb370355d4cd8534796bf32ac8bb04627cc Author: Ben Dooks Date: Tue Jan 26 16:06:46 2010 +0900 ARM: S3C24XX: Merge s3c2442 and s3c2440 machines into mach-s3c2440 Move the pair of machines in arch/arm/mach-s3c2442 into the mach-s3c2440 directory as the S3C2440 and S3C2442 are very close. Signed-off-by: Ben Dooks commit 66ac2f28b658f1938035966cafc42501758b4324 Author: Uwe Kleine-König Date: Mon Jan 25 17:55:16 2010 +0100 mx25: deprecate UART1_BASE_ADDR and UART2_BASE_ADDR Signed-off-by: Uwe Kleine-König commit 7d58289fc315258b4829a29d21c540eb35dd6feb Author: Uwe Kleine-König Date: Mon Jan 11 11:37:24 2010 +0100 mx1: prefix SOC specific defines with MX1_ and deprecate old names The old names are defined only if the cpp symbol IMX_NEEDS_DEPRECATED_SYMBOLS exists, which is defined (for now) for all files below arch/arm/mach-mx1. This was done earlier for mx2 and mx3, too. USBD_INT0 is for now defined unconditionally to prevent breaking drivers/usb/gadget/imx_udc. While at it use IMX_IO_ADDRESS to define MX1_IO_ADDRESS which adds a cast to the IO_ADDRESS macro fixing many warnings like arch/arm/mach-mx1/generic.c:51: warning: passing argument 1 of 'mxc_init_irq' makes pointer from integer without a cast . Signed-off-by: Uwe Kleine-König commit 4ec07bba6945290c48dcc5b789cbd7adeabd7695 Author: Ben Dooks Date: Sat Jan 30 15:02:58 2010 +0900 ARM: S3C2443: Use common clock gate code Add common clock gate code for each of the S3C2443 clock gate code. Whether to move this elsewhere will be decided later. Signed-off-by: Ben Dooks commit 1eaa4f2762899d2f3c54ba7a4fee564e255ad0a5 Author: Baruch Siach Date: Wed Jan 27 15:00:49 2010 +0200 mx25pdk: platform code for the DryIce RTC module Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit dcbabbc1fce2c32e4cfe0e18a2651226a72ecaae Author: Baruch Siach Date: Wed Jan 27 15:00:48 2010 +0200 mx25: add support for the DryIce rtc Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 4cb73288b195dc04c1f604c38bd4ebd2081db9fa Merge: 70c91a3 66ddfc6 Author: Sascha Hauer Date: Fri Jan 29 10:43:17 2010 +0100 Merge branch 'mxc-rc' into mxc-master commit 87aef30eb3c5dac0491c83fe3b90bc61f1df24ec Author: Atul Dahiya Date: Fri Jan 29 09:08:28 2010 +0900 ARM: S5P: Change S5P_TIMER_IRQ based to 11 for SAMSUNG S5P series. Currently, S5P_TIMER_IRQ is based at the end of VICs. This patch changes the S5P_TIMER_IRQ base from end of VICs to 11 in ISA IRQ space. No of VICs varies between SOCs. This causes an exception on S5P6442. Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit a814290e17ae314bd614476cffc6119846eca27e Merge: e55d193 ab5d97d Author: Russell King Date: Wed Jan 27 22:11:32 2010 +0000 Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable commit 81317960466ebd37fd958aa07993e3fea461dbe4 Author: Kukjin Kim Date: Wed Jan 27 16:57:07 2010 +0900 ARM: S5P6440: Move common memory map definitions for S5P 1. Moved common memory map definitions for S5P such as S5P_VA_XXX into plat-s5p/include/mach/map-s5p.h from mach-s5p6440/include/mach. 2. Removed unnecessary definitions in the map.h and irq.c 3. Removed the unnecessary support for unaligned UART address 4. Renamed S5P_VA_VICx definitions as VA_VICx 5. Moved the definitons of VIC_BASE to plat-s5p/include/plat/irqs.h Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit e96b234b7e9d24e50528287b881ca229b7f094b8 Author: Kukjin Kim Date: Mon Jan 25 14:24:04 2010 +0900 ARM: S5P6440: Move CPU specific code in plat-s5p to machine directory The s5p6440-clock.c and s5p6440-init.c code in the plat-s5p is specific to s5p6440 SoC based systems. So these files are being moved to the machine directory of s5p6440. And these files are renamed in the machine directory. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 70c91a384918736afee13104eea059cc7c8728a1 Author: Vladimir Zapolskiy Date: Tue Jan 26 14:00:40 2010 +0300 ARM: IMX31: configure pins iomux for SDHC setup on litekit board. This patch adds SDHC support, and corrects current pins setup. Added irq handling on card removal. Signed-off-by: Vladimir Zapolskiy Cc: Daniel Mack Cc: Sascha Hauer Signed-off-by: Sascha Hauer commit 4e41db871e0ea46b08eb3cdf887153c853e3ee3d Author: Uwe Kleine-König Date: Mon Jan 25 18:23:04 2010 +0100 mx2/mx3: debug-macro.S needs deprecated symbols This fixes: arch/arm/kernel/debug.S:147: Error: constant expression expected -- `ldrne r3,=(((UART1_BASE_ADDR)-AIPI_BASE_ADDR)+AIPI_BASE_ADDR_VIRT)' arch/arm/kernel/debug.S:163: Error: constant expression expected -- `ldrne r3,=(((UART1_BASE_ADDR)-AIPI_BASE_ADDR)+AIPI_BASE_ADDR_VIRT)' when compiling for mx2 with CONFIG_DEBUG_LL=y. A similar error exists on mx3 and is fixed by this commit, too. These were introduced by aae7019382896cf1075a93acc564e42601bc44a2. Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 159a3ddd6c0521b4ab81697b2cf06a903a854862 Merge: 50ee2d3 1725c67 Author: Ben Dooks Date: Tue Jan 26 18:21:40 2010 +0900 ARM: Merge next-smdk6410-defconfig Merge branch 'next-smdk6410-defconfig' into next-samsung commit 50ee2d35a592ead260527244af5160c7fa6189ea Author: Ben Dooks Date: Mon Jan 25 10:46:51 2010 +0900 ARM: SAMSUNG: Add error printing to s3c24xx_register_clocks Add an error print to s3c24xx_register_clocks to provide more useful information when failing to register the clock. I belive this was originally left out due to the possibility of a problem with low-level debugging code. However, if the low-level debug code is not functional by now there will be a whole other set of problems being presented to the system. Signed-off-by: Ben Dooks commit 8428d47a36a35c457a1147c3e8aa61c1be343604 Author: Ben Dooks Date: Mon Jan 25 10:44:10 2010 +0900 ARM: SAMSUNG: Add documentation to the clock registration calls. Add some kerneldoc documentation to the s3c24xx_register_clock and the s3c24xx_register_clocks() call. Signed-off-by: Ben Dooks commit 2f6c2ac1d945ffc2e343103bdcfccbdb2e2de805 Author: Ben Dooks Date: Tue Jan 26 10:38:52 2010 +0900 ARM: S3C64XX: Squash SDHCI setup into one file Squash the SDHCI setup for both the S3C6400 and S3C6410 into one file and make the S3C6410 case use the S3C6400 code. Signed-off-by: Ben Dooks commit 97ce9d6938d58e7846dc0365c720c13ebe64547e Author: Ben Dooks Date: Tue Jan 26 10:18:14 2010 +0900 ARM: S3C64XX: Remove useless IO descriptor from S3C6410 The iotable in arch/arm/mach-s3c64xx/s3c6410.c is currently empty and therefore can be removed from the build. Signed-off-by: Ben Dooks commit 431107ea5b680a24a4d01fbd3a178a3eb932f378 Author: Ben Dooks Date: Tue Jan 26 10:11:04 2010 +0900 ARM: S3C64XX: Merge mach-s3c6400 and mach-s3c6410 As per discussions with Russell King on linux-arm-kernel, it appears that both mach-s3c6400 and mach-s3c6410 are so close together that they should simply be merged into mach-s3c64xx. Note, this patch does not eliminate any of the bits that are still common, it is simply a move of the two directories together, any further common code will be eliminated or moved in further patches. Signed-off-by: Ben Dooks commit ab5d97db1c6ced3e95c00d097931471707032b1f Author: Ben Dooks Date: Mon Jan 25 10:39:23 2010 +0900 ARM: SAMSUNG: Fix bad use of __initdata for s3c_register_clocks() Functions should be marked __init, not __initdata. Signed-off-by: Ben Dooks commit f6b56704f78b2667fc8f61d2f398931fbc032b62 Author: Maurus Cuelenaere Date: Fri Jan 22 23:29:16 2010 +0100 ARM: SAMSUNG: Fix null pointer dereference in ADC driver ARM: SAMSUNG: Fix null pointer dereference in ADC driver Use struct adc_device instead of relying on client (which could be NULL) when checking for SoC type. Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit d85127319cc36c38eb99615c52531c6ef2f11369 Author: Thomas Abraham Date: Fri Jan 22 10:50:42 2010 +0900 ARM: S5PV210: Add serial port support This patch adds UART serial port support for S5PV210. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit a602f0f2f04f150fa1f7312b9e601e8e1a5afe10 Author: Uwe Kleine-König Date: Thu Dec 17 12:43:29 2009 +0100 arm/{pxa,sa1100,nomadik}: Don't disable irqs in set_next_event and set_mode These functions are called with irqs already off. This commit removes the calls to raw_local_irq_save and raw_local_irq_restore on platforms that don't have to use a shared interrupt for their timekeeping. Signed-off-by: Uwe Kleine-König commit 501d70383aa9ffc78b41aa7e74f6b0254c7c731c Author: Uwe Kleine-König Date: Mon Sep 21 09:30:09 2009 +0200 arm/at91: Don't disable irqs in set_next_event and set_mode callbacks on AT91 the timer irq is shared, so the handler might be entered without irqs being disabled. Though this should not happen as the timer irq is registered early, there have been some reports on the mailing list. To make debugging that problem easier next time it pops up a WARN_ON_ONCE is added to the handler if irqs are not off. Signed-off-by: Uwe Kleine-König commit 0647aee035245e0e5ea39ae17cf909b7099f988d Author: Ben Dooks Date: Wed Jan 20 15:09:40 2010 +0900 ARM: S5P6440: Add HSMMC and OTG base addresses to map.h Add the HSOTG and HSMMC block addresses to the map.h file. Signed-off-by: Ben Dooks commit 1725c679a08902ce04419b274d22254155ce707c Author: Ben Dooks Date: Tue Jan 19 13:16:50 2010 +0900 ARM: S3C64XX: Update s3c6400_defconfig for current kernel Update the s3c6400_defconfig with one from the current kernel which has been build and run tested on an SMDK6410. Signed-off-by: Ben Dooks commit 3a3b585aa4ecad21ae91cfa9e5f387d64a15a312 Author: Ben Dooks Date: Tue Jan 19 11:34:58 2010 +0900 ARM: S3C6400: Update s3c6400_defconfig for bigger initrds for SMDK6410 The Samsung initrd for SMDK6410 is now bigger than the original initrds that where used. Increase the command-line size and the size of the ramdisk that it is unpacked into. Also change the default init to /linuxrc to avoid problems with the current SMDK ramdisk image failing to run /bin/bash. Signed-off-by: Ben Dooks commit 75497d96b2094d325594b46d5e5f12b2396c4d51 Author: Ben Dooks Date: Thu Jan 21 13:31:38 2010 +0900 ARM: S3C64XX: Tidy up common code in s3c64xx_spi_set_info() The s3c64xx_spi_set_info() sets one of two platform data structures depending on which controller is being specified. Change to taking a pointer to the relevant platform data structure and then having one set of code to place the data into the area being pointed to. Cc: Jassi Brar Signed-off-by: Ben Dooks commit bd548e5ef21ac2ff18b262a905543d7a2340fb87 Author: Maurus Cuelenaere Date: Thu Jan 21 01:37:28 2010 +0100 ARM: S3C64XX: Fix typo in s3c-hsotg platform data ARM: S3C64XX: Fix typo in s3c-hsotg platform data Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit 46f2b478b21bdb5bb588317c971a77df13702660 Author: Mark Brown Date: Wed Jan 20 13:06:05 2010 +0000 ARM: SAMSUNG: Staticise gpiolib implementation functions They are not exported, they are referenced via vtables. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 8dcdd6e6bb09ba1915668b45a0ee730e820d0de1 Author: Mark Brown Date: Wed Jan 20 13:06:04 2010 +0000 ARM: S3C64XX: Staticise audio platform data It's not exported. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 1c24522c05f25b89cc4df5a875d8a005a774f570 Author: Mark Brown Date: Wed Jan 20 12:05:55 2010 +0000 ARM: S3C64XX: Fix dev-audio build As reported when the patch was posted commit 71269364 ("ARM: S3C64XX: Add I2S resources in platform code") uses pin names for the IISv4 data output pins which are not present in mainline, causing dev-audio to fail to build. Fix this by using the defines which are actually present in the kernel source. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 9fca878623378e7dd6da8e7135a561c17bc1112b Author: Mark Brown Date: Tue Jan 19 15:26:56 2010 +0000 ARM: SMDK6410: Set up interrupt range for WM835x on 1190-EV1 PMIC board The WM835x driver won't actually use this yet but it will in the future when the changes converting it to genirq are merged. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 8005745d6eea79da8ee2e7fe978d14e412aa3353 Author: Ben Dooks Date: Wed Jan 20 12:29:25 2010 +0900 ARM: SAMSUNG: Move pm-check.c to plat-samsung Move the pm-check.c file to plat-samsung for all Samsung SoC users, and update Kconfig names to make them SAMSUNG_ instead of S3C2410_ Sed expresions used to make the change: s/S3C2410_PM_DEBUG/SAMSUNG_PM_DEBUG/g s/S3C2410_PM_CHECK/SAMSUNG_PM_CHECK/g Signed-off-by: Ben Dooks commit 106cc6aa73f594015fc8b99f7c70d1b7cf23f19a Author: Ben Dooks Date: Wed Jan 20 12:22:24 2010 +0900 ARM: SAMSUNG: Move pmw.c to plat-samsung Move the PWM driver support to plat-samsung, as these PWM blocks are close enough across the current range to be supported by this driver. Signed-off-by: Ben Dooks commit 6890556c140469622497bea98cf49bf93f92f922 Author: Ben Dooks Date: Wed Jan 20 11:09:28 2010 +0900 ARM: SAMSUNG: Move more support into plat-samsung Move header files which are not likely to be touched in any further support addition out of plat-s3c's include directory into plat-samsung. Signed-off-by: Ben Dooks commit 5b8a2fb34f5670b1f07483bfa40de9ce539dbdb2 Author: Roel Kluin Date: Sun Jan 17 20:25:36 2010 +0100 msm_sdcc.c: missing brackets in msmsdcc_resume() Since the curly brackets were missing the test and enable_irq(), if true, occurred twice. Signed-off-by: Roel Kluin commit 54b89177ac533dc7439491afd26baf59464b425c Merge: a0c814a af15194 Author: Ben Dooks Date: Tue Jan 19 18:53:46 2010 +0900 ARM: Merge next-samsung-s5p6440-iodec Merge branch 'next-samsung-s5p6440-iodec' into next-samsung-try10 commit a0c814afcfc2c840698372bd402b669b659ee1c5 Author: Ben Dooks Date: Mon Nov 23 23:32:31 2009 +0000 ARM: SAMSUNG: Add initial documentation directory and overview Start Documentation/arm/Samsung and add an initial overview file which whilst is not complete, is better than nothing. Signed-off-by: Ben Dooks commit af1519408a0d40f312e8f103504cd292cc49d927 Author: Kukjin Kim Date: Tue Jan 19 11:21:39 2010 +0900 ARM: S5P6440: Add IO descriptor for ChipID block. This patch adds the IO descriptor for ChipID block in S5P6440. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit e856bb1f8dfcd924a973102a244b81920752648e Author: Ben Dooks Date: Tue Jan 19 17:14:46 2010 +0900 ARM: SAMSUNG: Remove empty gpio-core.h and use central plat/gpio-core.h Rename mach-s3c2410/include/mach/gpio-core.h to mach/gpio-track.h so that it can be included by when needed. Eliminate all other empty gpio-core.h files and just include the as necessary. Signed-off-by: Ben Dooks commit 16e2c7c59f0a4debcb110648025bef11958aa3cd Author: Ben Dooks Date: Mon Jan 18 18:00:55 2010 +0900 ARM: SAMSUNG: Move GPIO headers to plat-samsung Move the GPIO and GPIO configuration headers into arch/arm/plat-samsung as they are common to all the Samsung SoCs. Signed-off-by: Ben Dooks commit 4f2b617aff8147338faa0d5ed7b57636076671bf Author: Ben Dooks Date: Mon Jan 18 11:22:38 2010 +0900 ARM: SAMSUNG: Move gpiolib support in gpio.c to plat-samsung Move the gpio.c code containing the core gpiolib and GPIO support to plat-samsung from plat-s3c as it is used by all current Samsung SoCs. Note, we didn't move this to gpiolib.c as it contains code that is not strictly for gpiolib support and the 4bit code is already called gpiolib.c so make the change easier by not renaming both files in one go. Signed-off-by: Ben Dooks commit 67866fb38680d85cbd13c7bb468fb89f16e026d1 Author: Ben Dooks Date: Mon Jan 18 10:47:45 2010 +0900 ARM: SAMSUNG: Move pm-gpio into plat-samsung Move the pm-gpio code into plat-samsung. Note, this should be changed later to properly compile the 4bit code if the 4bit settings are enabled. Signed-off-by: Ben Dooks commit 42d828d46f526605c84ebdb5a987fd25fe09a3c9 Author: Kukjin Kim Date: Tue Jan 19 15:31:17 2010 +0900 ARM: S5P6440: Add S5P6440 GPIO support This patch adds Samsung's S5P6440 GPIO support. Signed-off-by: Adityapratap Sharma Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 1f323cfda5feee4e9c1fc09ededaee849f906468 Author: Kukjin Kim Date: Tue Jan 19 15:30:54 2010 +0900 ARM: SAMSUNG: Move GPIO common functions to plat-samsung This patch moves GPIO common functions (from plat-s3c64xx) into plat-samsung. and adds the config option to build the plat-samsung/gpiolib for Samsung SoCs. Signed-off-by: Adityapratap Sharma Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 9717453c40ba9ffbd8c40968df45498059bfec0e Merge: ea2de1d 51fe522 Author: Ben Dooks Date: Tue Jan 19 18:36:16 2010 +0900 ARM: Merge next-samsung-serial1 Merge branch 'next-samsung-serial1' into next-samsung-try7 commit ea2de1dc8b5872de21a03757dca9d1560b5c9a81 Merge: 668dfc7 f9e011b Author: Ben Dooks Date: Tue Jan 19 18:36:12 2010 +0900 ARM: Merge next-samsung-clock2 Merge branch 'next-samsung-clock2' into next-samsung-try7 commit 668dfc7527eb755e1bf194bf19c0c281e9df6deb Merge: 9e15714 22c810a Author: Ben Dooks Date: Tue Jan 19 18:36:09 2010 +0900 ARM: Merge next-samsung-devupdates1 Merge branch 'next-samsung-devupdates1' into next-samsung-try7 commit 9e157144afe81052f5abe122c2469e33a30d20a5 Merge: 44d6cef8 6a2b411 Author: Ben Dooks Date: Tue Jan 19 18:36:04 2010 +0900 ARM: Merge next-jassi-spi Merge branch 'next-jassi-spi' into next-samsung-try7 commit 51fe52229e3765dc56b8d2dd5df656fbf8a20500 Author: Thomas Abraham Date: Thu Jan 14 15:05:38 2010 +0900 ARM: SAMSUNG: serial: Modify console initialization. This patch modifies s3c24xx_serial_initconsole function to accept multiple platform UART information structures. This is required on platforms that have differences among the instances of UART ports. As an example, the FIFO sizes could be different for each UART instance and hence multiple platform UART information structures would be needed. This patch also modifies the s3c24xx_console_init macro since it wraps the call to the s3c24xx_serial_initconsole function. Signed-off-by: Thomas Abraham Signed-off-by: Ben Dooks commit bb9b1c772727849051e485a877aa9a4b2d3ac1a1 Merge: c3e71c6 f9e011b Author: Ben Dooks Date: Tue Jan 19 17:49:59 2010 +0900 ARM: Merge next-samsung-clock2 Merge branch 'next-samsung-clock2' into next-samsung-try5 commit c3e71c6d21a760c27b511e3dd9dbe46517c6f0f7 Merge: 645f0b0 22c810a Author: Ben Dooks Date: Tue Jan 19 17:48:35 2010 +0900 ARM: Merge next-samsung-devupdates1 Merge branch 'next-samsung-devupdates1' into next-samsung-try5 commit 645f0b07fe0dd0fa697c5b327c2d8c005bd0b5c0 Merge: 44d6cef8 6a2b411 Author: Ben Dooks Date: Tue Jan 19 17:47:39 2010 +0900 ARM: Merge next-jassi-spi Merge branch 'next-jassi-spi' into next-samsung-try5 commit 44d6cef805c1b17218723279a2767484e43d6fac Merge: 8e2376a a4e9469 Author: Ben Dooks Date: Tue Jan 19 17:42:25 2010 +0900 ARM: Merge next-s3c6410-andygreen Merge branch 'next-s3c6410-andygreen' into next-samsung-try5 commit 8e2376ab1086b2bff18fdb887f5bc13740ae6e24 Merge: 7126936 bcedfa9 Author: Ben Dooks Date: Tue Jan 19 17:42:02 2010 +0900 ARM: Merge next-samsung-mc-adc Merge branch 'next-samsung-mc-adc' into next-samsung-try5 Conflicts: arch/arm/mach-s3c6400/include/mach/map.h (fix ADC and RTC merge) commit 22c810ab3e25d16e6f128384d107b933b6fd8fff Author: Ben Dooks Date: Mon Jan 18 16:24:22 2010 +0900 ARM: S3C24XX: Add mci platform data set call s3c24xx_mci_set_platdata(). Add a s3c24xx_mci_set_platdata() call for all the machine files that have platform data for the MCI driver. This brings the MCI device into line with the other devices with __initdata and a specific call to ensure the right structure type is being passed. Signed-off-by: Ben Dooks commit 3cd2fff59fc924752611301f4ca7e8484f5744a5 Author: Ben Dooks Date: Fri Jan 15 15:09:20 2010 +0900 ARM: MINI2440: Remove commented out devices from device array There's no point in having these in until there is proper support for them, so remove as they only confuse the device changing script. Signed-off-by: Ben Dooks commit f126752043c67003de6d34b14160f87ba0323c98 Author: Ben Dooks Date: Wed Jan 13 14:59:46 2010 +0900 ARM: SAMSUNG: Add platform data registration for OHCI Add a platform data helper for the OHCI device Signed-off-by: Ben Dooks commit 0a6361316d6493b9dcbdda9a6a4586c3ccbfd008 Author: Ben Dooks Date: Tue Jan 12 15:15:28 2010 +0900 ARM: SAMSUNG: Make UART device code common Move s3c24xx_uart_devs, s3c24xx_uart_src and the platform devices to a common entry in plat-samsung since they are the same in all the current implementations. Signed-off-by: Ben Dooks commit 6a2b4111643127a28944d673995810a82582c5a1 Author: Jassi Brar Date: Mon Jan 18 17:32:02 2010 +0900 ARM: S3C64XX: SPI: Define SPI controller devices Platform devices for SPI Controller of S3C64XX are defined and exported for machines to include. Also, controller setup helper functions are defined for machine code to set runtime configuration of the controller and the bus. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 398ccccb770e6ed3e138925404f0746cbe57c5a1 Author: Jassi Brar Date: Mon Jan 18 17:45:52 2010 +0900 ARM: S3C64XX: SPI: Header for passing platform data We need a way to pass controller specific information to the SPI driver. For that purpose new headers are made. SPI Controller is assumed 'type-s3c64xx' and can be defined for newer SoCs. Hence, that part is placed under plat-samsung to be shared across newer SoCs. SoC specific part - spi source clocks, will be placed under plat-/include/plat/ Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 87315a802a8aab9d986858fcf2230726c1b5c598 Author: Jassi Brar Date: Mon Jan 18 16:15:08 2010 +0900 ARM: S3C64XX: SPI: Define SPI-48M clock sources Defined special 48MHz clock sources for SPI-0,1. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 10f9f743f661d200a7a0006e65688cf28c2f01d9 Author: Jassi Brar Date: Mon Jan 18 16:15:07 2010 +0900 ARM: S3C64XX: SPI: Add SPI controller register base Added SPI controller register base. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit f9e011b6b305d38445bbd4a1e7a8814e056de37b Author: Ben Dooks Date: Mon Jan 18 15:57:42 2010 +0900 ARM: SAMSUNG: Fix bug in clksrc-clk round_rate call. The call has been assuming all clksrc-clks' divider size is 4 bits, but this may not be the case anymore. Use the reg_div.size parameter to calculate the maximum value it can take and check against that. Signed-off-by: Ben Dooks commit f3b464cca94c4a8f54fbc11ec5af8b143fd1750b Author: Ben Dooks Date: Mon Jan 18 15:37:25 2010 +0900 ARM: SAMSUNG: Fix clksrc-clk's checks for bad register settings The WARN_ON() was only checking the first clock in the array, instead of being executed for each clksrc clock being registered. Since this is an array of clocks, WARN_ON() does not provide a lot of useful information about the problem, so change to using printk(KERN_ERR) to report the problem to the console. As a note, we still try and register the clock even if these problems are present just in case and to avoid changing the behaviour of the registration process. Signed-off-by: Ben Dooks commit b8792dbff6ed93c5a77f71917d4a0c5efa12eee1 Author: Thomas Abraham Date: Mon Jan 18 14:30:16 2010 +0900 ARM: SAMSUNG: Add check to ensure that clksrc_clk does have multiple clock sources Adds a additional check in s3c_set_clksrc function to ensure that the clksrc_clk does have a choice of multiple clock sources. In addition to this, a check is added to ensure that a parent is assigned to the clksrc_clk in case it does not have a choice of parent clocks. Signed-off-by: Thomas Abraham Signed-off-by: Ben Dooks commit a0de298a0eee7f9004a8e512c12c7b40d66c9934 Author: Ben Dooks Date: Mon Jan 18 13:24:01 2010 +0900 ARM: S5PC1XX: Register pd0 and hd0 clocks, remove unecessary dummy_enable The clk_hd0 and clk_pd0 where given a local dummy_enable call due to not being registered with the clock code, which they really should have been. Register these two clocks and remove the clk_dummy_enable as this is done by the default clock registration code. Signed-off-by: Ben Dooks commit a4e946947b966d018f3f712d5c7ca2932c2aadd2 Author: Andy Green Date: Tue Dec 29 14:40:43 2009 +0000 ARM: SMDK6410: Add comments on ethernet connectivity LAN9115 Ethernet only works on SMDK6410 if certain switches are set in specific ways. Document the requirement. Signed-off-by: Andy Green Signed-off-by: Ben Dooks commit 810f613c03a1614c71a2b27859e91ae155bd659f Author: Andy Green Date: Tue Dec 29 14:40:30 2009 +0000 ARM: S3C64XX: Add virtual mapping for S3C64XX SROM area This adds the physical address of the SROM unit, and applies a virtual mapping for it to the S3C_VA_MEM slot. Signed-off-by: Andy Green Signed-off-by: Ben Dooks commit f01fdac005d44e6c36af5b5eb841c4804570f0ad Author: Andy Green Date: Tue Dec 29 14:40:36 2009 +0000 ARM: SMDK6410: Add nC1 chipselect SROM setup Since the mach-smdk6410.c file claims it can start up the smsc9115 ethernet device on the board, it should take care about configuring the necessary chip select nCS1 so it can see the chip. The select defaults to 8-bit mode so without config the Ethernet doesn't work. This patch uses the new SROM definitions to set nCS1 to the state found in the Samsung U-Boot port for 6410. It may be more conservative that it needs to be since those settings were marked as for CS8900A also using this chip select. But this change is enough to get the ethernet working when booted with Qi. Signed-off-by: Andy Green Signed-off-by: Ben Dooks commit a7c9194cdc9a858bbf5a4cdae289e28dea149aeb Author: Andy Green Date: Tue Dec 29 14:40:23 2009 +0000 ARM: S3C64XX: Add SROM register definitions This introduces a platform file for s3c64xx that defines the SROM unit registers that control chip select characteristics. Signed-off-by: Andy Green Signed-off-by: Ben Dooks commit 0084f27a21d36ac846cd4366289c229a7cce511b Merge: bcedfa9 7126936 Author: Ben Dooks Date: Mon Jan 18 09:35:29 2010 +0900 ARM: Merge next-s3c64xx Merge branch 'next-s3c64xx' into next-samsung Conflicts: arch/arm/mach-s3c6400/include/mach/map.h ( ADC and RTC PA merge fixed) commit bcedfa98d97e02e95bb023ab93675dbe63c508ef Author: Maurus Cuelenaere Date: Thu Jan 14 00:30:34 2010 +0100 ARM: S3C64XX: Add S3C64XX support to the generic Samsung ADC driver Add S3C64XX support to the generic Samsung ADC driver Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit 3929e1e76d9116856a4c7a00fcce0539dd8507a0 Author: Maurus Cuelenaere Date: Thu Jan 14 00:30:31 2010 +0100 ARM: SAMSUNG: Move S3C24XX ADC driver to plat-samsung Move S3C24XX ADC driver to plat-samsung Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit 71269364a8d5ea42ecc6cbc7b687e5d45cbabe0e Author: Jassi Brar Date: Wed Jan 6 15:33:44 2010 +0900 ARM: S3C64XX: Add I2S resources in platform code Define resources needed by the I2S drivers in platform code. Audio cfg_gpio callback and IORESOURCE_DMA are added. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 206090913d0d6ad3506e3e2693a696fc1626993e Author: Maurus Cuelenaere Date: Tue Jan 12 01:40:14 2010 +0100 ARM: S3C64XX: Add S3C64XX RTC platform driver Add S3C64XX RTC platform driver Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit 0f61628e37e121b7786bff2653fc25a321e82ec4 Author: Ben Dooks Date: Sun Nov 29 14:34:56 2009 +0000 ARM: S3C2412: Fixup commented out device in SMDK2413 The SMDK2413 has a commented out device that does not have any setup data for it, so remove it for now. Signed-off-by: Ben Dooks commit b813248c614b07642adbf1d7b577d0466003b339 Author: Ben Dooks Date: Mon Nov 23 00:13:39 2009 +0000 ARM: S3C: Rename s3c_device_usb to s3c_device_ohci Prepare for the forthcoming device changes by renaming s3c_device_usb to s3c_device_ohci as this is what the device represents. Signed-off-by: Ben Dooks commit 501dae90b3ae4dd3d8efdacfcb072c3d65eb5a33 Author: Kukjin Kim Date: Thu Jan 14 08:23:53 2010 +0900 ARM: S5P6440: Add serial port support This patch adds UART serial port support for S5P6440 CPU. Most of the serial support of Samsung's 6400 CPU is reused for 6440 CPU. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 62a6156e88b2e89eafed30aefc97ff4979393c1c Author: Kukjin Kim Date: Thu Jan 14 08:23:04 2010 +0900 ARM: S5P6440: Add configuration file This patch adds Samsung's S5P6440 default configuration file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit d25168ea9308e19c7000f0c997eedec87c5d6298 Author: Kukjin Kim Date: Thu Jan 14 08:22:00 2010 +0900 ARM: S5P6440: Add Board support file This patch adds Samsung's SMDK6440 board support file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit c4ffccddd54b669cc9683f2c69e31035e916a1a0 Author: Kukjin Kim Date: Thu Jan 14 08:19:36 2010 +0900 ARM: S5P6440: Add new Kconfig and Makefiles This patch adds the Kconfig and Makefile for the new S5P6440 machine and platform directories. It also updates arch/arm Kconfig and Makefiles to include the support for the new S5P6440 CPU. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 5f3545f64a44b2b2dac34141dba23d18cdf40a92 Author: Kukjin Kim Date: Thu Jan 14 08:15:39 2010 +0900 ARM: S5P6440: Add Timer support This patch adds timer support for S5P6440 CPU. Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit b7db51be43bc8f9943324a00b80e5d034de0a733 Author: Kukjin Kim Date: Thu Jan 14 08:14:40 2010 +0900 ARM: S5P6440: Add IRQ support This patch adds IRQ support for S5P6440 CPU. Signed-off-by: Adityapratap Sharma Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 1a0e8a52ad56075663d8e120e2468fc96fb6fa6c Author: Kukjin Kim Date: Thu Jan 14 08:13:37 2010 +0900 ARM: S5P6440: Add Clock and PLL support This patch adds clock and pll support for S5P6440. This patch are based on Harald Welte's patches and Ben's plat-samsung. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 209fecd1b8e65b8046efbbc8314d449e53c4c6b6 Author: Kukjin Kim Date: Thu Jan 14 15:29:17 2010 +0900 ARM: S5P6440: Add new CPU initialization support This patch adds Samsung's S5P6440 CPU support. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit be97162d47b2e067f9d21097650f2f0405dacc9f Author: Ben Dooks Date: Tue Jan 12 14:13:58 2010 +0900 ARM: S5PC1XX: Use common UART IRQ handling code Use the common UART IRQ handling code for the S5PC100 system. Signed-off-by: Ben Dooks commit 47101ec73901183520de724fb5f9062c014236bb Author: Ben Dooks Date: Thu Jan 7 14:41:38 2010 +0900 ARM: S5PC1XX: Move to using standard timer IRQ handling code Move to using the standard VIC/Timer IRQ handling code added previously to avoid duplicating code. Thanks to Marek Szyprowski for pointing out dual Kconfig change. Signed-off-by: Ben Dooks commit 35accd2f6639a9245488f2f389e3c6372c7641e4 Author: Ben Dooks Date: Tue Jan 12 13:10:59 2010 +0900 ARM: S5PC1XX: Remove definitions deleted by previous clksrc changes Remove the definitions we've deleted in the previous updates to the clksrc_clk for arch/arm/plat-s5pc1xx/include/plat/regs-clock.h. Added comments about the removal to the clock header since we only need these defines in one place (and they've now been removed there) we get rid of them from the header. Signed-off-by: Ben Dooks commit 37872bb9efddf9518cc77c43f9fa8fc6bfd3d727 Author: Ben Dooks Date: Tue Jan 12 12:52:43 2010 +0900 ARM: SAMSUNG: Add script to change old clksrc_clk to new register defs This script is used to change the old style clksrc_clk as originally found in plat-s3c64xx to the new style. It is here for reference if needed for future code merges. Signed-off-by: Ben Dooks commit c837e88cf9e18c311332cc1c8c488993a201d568 Author: Ben Dooks Date: Tue Jan 12 12:49:17 2010 +0900 ARM: S5PC1XX: Change clksrc_clks to use array of clocks Remove the individual 'struct clksrc_clks' and place them into an array so that we can simply use s3c_register_clksrcs to register tham all in one go. Since the spdif clock relies on the audio clock, move the audio clocks into their own arrary. Thanks to Marek Szyprowski for testing and pointing out the four clocks what where missed from the clock list. Signed-off-by: Ben Dooks commit 1d026d9b1671bcb05e7b00f545f1d62476e9063c Author: Ben Dooks Date: Tue Jan 12 12:39:58 2010 +0900 ARM: S5PC1XX: Move clock definitions around ready to turn into clksrc arrays Move the clock definitions around ready to turn the clocks into an array of clocks and register them in one go. Signed-off-by: Ben Dooks commit 45426468148d77e8c5eaece21d2a16e063066567 Author: Ben Dooks Date: Tue Jan 12 12:19:28 2010 +0900 ARM: S5PC1XX: Move to using generic clksrc_clk for clock code Remove the copy of the old s3c64xx struct clksrc_clk and use the new one in plat-samsung. This eliminates a bug in the set_parent() call where it failed to set the clk->parent after sucesfully updating the clock. The script that was used to automate much of the process will be supplied seperately. Signed-off-by: Ben Dooks commit 85841bcedd6048dd37cab58a504e5317192324c6 Author: Kukjin Kim Date: Mon Jan 11 12:21:51 2010 +0900 ARM: SAMSUNG: Add config option for number of additional GPIO pins. This patch adds a configuration option for specifing the number of additional GPIO pins to be used in addition to the GPIO pins supported onchip. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 5b39be4637bb795b2133dbee0eadbcc08bdd4134 Author: Ben Dooks Date: Thu Jan 7 08:59:26 2010 +0900 ARM: Add common entry code for system with two VICs Add a common entry-macro-vic2.S for systems where there are two VICs so that the machine or platform directories just need to setup the correct information before including into their own entry-macro.S file. Since this code is from the S3C64XX project, we update the S3C64XX machine entry code to use this new header. Signed-off-by: Ben Dooks commit 51022cf6591ae2945960d034788bdeffa28cde13 Author: Ben Dooks Date: Wed Jan 6 11:18:44 2010 +0900 ARM: SAMSUNG: Move IRQ UART handling for newer devices to plat-samsung Move the handling for the UART interrupts out of the s3c64xx specific code and into plat-samsung so that it can be used by all implementations that need it. Signed-off-by: Ben Dooks commit 7162ba03729e0a47aaab44448ce2453f07a9664d Author: Ben Dooks Date: Wed Jan 6 10:14:51 2010 +0900 ARM: SAMSUNG: Move IRQ VIC timer handling out to common header files Move the VIC based timer interrupt handling out of plat-s3c64xx and into plat-samsung to be re-used for other systems. This also reduces the code size as we now have a common init routine and use the irq_desc to store the interrupt number of the timer. Signed-off-by: Ben Dooks commit 4f830db9629e413e7c5523085ab009b0de5ae6d0 Author: Ben Dooks Date: Wed Jan 6 02:28:20 2010 +0900 ARM: SAMSUNG: Move gpio-config.c into plat-samsung The arch/arm/plat-s3c/gpio-config.c file is common to pretty much all the Samsung SoCs, so move it to arch/arm/plat-samsung Signed-off-by: Ben Dooks commit b6a604137bb978d9f65b1228cf0bb691ece45cba Author: Ben Dooks Date: Wed Jan 6 02:45:09 2010 +0900 ARM: SAMSUNG: Move device definitions in plat-samsung Move all the platform device definitions from plat-s3c into plat-samsung Signed-off-by: Ben Dooks commit 9745626b65b856bf58e70feb4eee1e5471db699e Author: Ben Dooks Date: Wed Jan 6 02:39:28 2010 +0900 ARM: SAMSUNG: Move pwm-clock code into plat-samsung Move the code for the pwm-clock into plat-samsung, as it is common to all Samsung SoCs. Signed-off-by: Ben Dooks commit ed276849bc6a8ad5bb0f9fa94fe8305ee67bb6c6 Author: Kukjin Kim Date: Thu Jan 14 12:50:23 2010 +0900 ARM: SAMSUNG: Make clk_default_setrate and clk_ops_def_setrate visible This patch makes clk_default_setrate and clk_ops_def_setrate available to code outside plat-samsung clock code. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 14235696d401e62f8f5740ca2fb917ab42b9fd18 Author: Ben Dooks Date: Wed Jan 6 01:53:25 2010 +0900 ARM: SAMSUNG: Do not register set_parent call if no source If there is no source register defined, do not register a clksrc clock with a valid .set_parent in the ops. Signed-off-by: Ben Dooks commit 1d9f13c49ed750260f40317629bdd66160a3ac16 Author: Ben Dooks Date: Wed Jan 6 01:21:38 2010 +0900 ARM: SAMSUNG: Add call to register array of clocks Add s3c_register_clocks() to register an array of clocks, printing an error message if there is a problem. Replace all points in the code where this could be used. Signed-off-by: Ben Dooks commit fb6e76cd2309c76d2120e013ff34ff6ab27aad88 Author: Ben Dooks Date: Wed Jan 6 01:07:57 2010 +0900 ARM: SAMSUNG: Do not allow get/set/round rate calls with no divider If the reg_div field is not set, then do not register clk_ops with the get/set/round rate calls as these will fail to work. Signed-off-by: Ben Dooks commit 2c2f69b15d5420291a941ace10149e76f0af7ab0 Author: Ben Dooks Date: Wed Dec 23 18:43:48 2009 +0000 ARM: SAMSUNG: Move clock.c to arch/arm/plat-samsung This is the core implementation of the clock code for all Samsung based SoCs, so move it to arch/arm/plat-samsung (the clock.h file has already been moved). Since the file is built for every Samsung SoC, no changes are needed to the Kconfig system. Signed-off-by: Ben Dooks commit 682e2b7d45878586ce84f6993da0b8a2981a399d Author: Ben Dooks Date: Wed Dec 9 00:08:35 2009 +0000 ARM: S3C64XX: Avoid announcing clksrc clocks twice The new code calls the clock setup code on registration which can be before the clock system has been fully initialised. The following code re-does this setup at the end of the clock registration and thus we get two printings. Update the calls to only print on the last pass or when doing the necessary resume work. Signed-off-by: Ben Dooks commit f3e0b724cc70ef5ee2a6e0d9dfafa2328c294ab3 Author: Ben Dooks Date: Tue Dec 8 01:26:07 2009 +0000 ARM: S3C64XX: Fixup .reg_src and .reg_div with named initialisers Change these two fields to have named initialisers as per the review comments from Kyungmin Park. sed used: s@\.reg_src\(.*\)=\(.*\){\(.*\),\(.*\),\(.*\)}@.reg_src\1=\2{ .reg =\3, .shift =\4, .size =\5 }@g s@\.reg_div\(.*\)=\(.*\){\(.*\),\(.*\),\(.*\)}@.reg_div\1=\2{ .reg =\3, .shift =\4, .size =\5 }@g Signed-off-by: Ben Dooks commit b3bf41be06634d69959a68a2b53e1ffc92f0d103 Author: Ben Dooks Date: Tue Dec 1 01:24:37 2009 +0000 ARM: SAMSUNG: Reduce size of struct clk. Reduce the size of struct clk by 12 bytes and make defining clocks with common implementation functions easier by moving the set_rate, get_rate, round_rate and set_parent calls into a new structure called 'struct clk_ops' and using that instead. This change does make a few clocks larger as they need their own clk_ops, but this is outweighed by the number of clocks with either no ops or having a common set of ops. Update all the users of this. Signed-off-by: Ben Dooks commit 13bbd88504bfa0d205fa4121322869d8d7e083d0 Author: Harald Welte Date: Tue Dec 1 01:24:36 2009 +0000 ARM: S3C64XX: Remove unused clock definitions from clock header Clean out the definitions we are no longer using after the new clock code updates. Signed-off-by: Harald Welte [ben-linux@fluff.org: split from initial patch provided] Signed-off-by: Ben Dooks commit 399cae747426a6acdba8e347edef241a05a08b09 Author: Ben Dooks Date: Tue Dec 1 01:24:35 2009 +0000 ARM: S3C64XX: Use new clock-clksrc.c code for clocks. Move the s3c6400-clock.c implementation over to use the new common plat-samsung based clock-clksrc.c. Note, this does not delete the clocks definitions that are now unused in the regs-clock.h to reduce the quantity of change in this commit. Based on original patches by Harald Welte. Signed-off-by: Ben Dooks commit aa9ad6ad9c16e1daff41792c485f46e601a5af33 Author: Harald Welte Date: Tue Dec 1 01:24:34 2009 +0000 ARM: SAMSUNG: Add core clock implementation for clksrc based clocks Add a core for the clksrc clock implementation, which is found in many of the newer Samsung SoCs into plat-samsung. Signed-off-by: Harald Welte [ben-linux@fluff.org: split from original patch to make change smaller] [ben-linux@fluff.org: split clk and clksrc changes] [ben-linux@fluff.org: moved to plat-samsung from plat-s3c] [ben-linux@fluff.org: re-wrote headers after splits] [ben-linux@fluff.org: added better documentation to headers] Signed-off-by: Ben Dooks commit 8360493c4ae4c116339cd1cf4da100c3547f23af Author: Ben Dooks Date: Mon Nov 30 01:31:32 2009 +0000 ARM: S3C64XX: Compress s3c6400-clock.c code The individually named clocks are all static to the code and thus can be compressed into a single array and then the array can be referenced. This removes the need for a seperate array of pointers to clocks. Fix a minor problem of re-initialising the pointers in s3c6400_set_clksrc() as this is also called by the cpufreq code. Move these initialisations to the code that does the registration. Based on Harald Welte's original clock changes patch. Signed-off-by: Ben Dooks commit f9c4f1e4ddf40103dcf85e23d00230ab8ece2a89 Author: Ben Dooks Date: Mon Nov 30 01:10:57 2009 +0000 ARM: S3C64XX: Cleanup common init code in s3c6400-clock.c Remove the four fields from clksrc_clk.clk which are always the same and init them when the clock is registered. This helps remove the amount of repeated code. This is a re-work of Harald Welte's clock changes for the latest kernel. Signed-off-by: Ben Dooks commit 70792bcfad5f4817fc067b7fdb0541d8b13b5502 Author: Ben Dooks Date: Mon Nov 30 00:40:47 2009 +0000 ARM: SAMSUNG: Move to plat-samsung Move the header to plat-samsung where it can be used by all the platforms, and readies it for the next round of clock updates where the clock code will be amalgamated. Signed-off-by: Ben Dooks commit b97235dfa1aba54786b19fc53ba026e47be86ac6 Author: Baruch Siach Date: Thu Jan 14 11:24:15 2010 +0200 mx25pdk: add NAND device support Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 27f590258954ea0d22b43e33dd356bc76a8dfe7a Author: Baruch Siach Date: Thu Jan 14 11:24:14 2010 +0200 mx25: add NAND support Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit b6d0c1bda9038354ff2f0c77da23fd32e0f11a1f Author: Baruch Siach Date: Thu Jan 14 11:24:13 2010 +0200 mtd: mxc_nand: add MX25 to Kconfig Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 37439a0f123e9eecf7b3920c9f9bd25e35ea8e3e Merge: becc670 a8dfb64 Author: Sascha Hauer Date: Thu Jan 14 10:58:10 2010 +0100 Merge branch 'imx' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master commit 8045e2985012bdb95d832dfbcceae1815880a6ed Author: OGAWA Hirofumi Date: Tue Jan 12 03:32:24 2010 +0900 fat: Fix vfat_lookup() After d_find_alias(), vfat_lookup() checks !(->d_flags & DCACHE_DISCONNECTED) without IS_ROOT(). This means it hits non-anonymous but disconnected dentry. (NOTE: d_splice_alias() doesn't clear DCACHE_DISCONNECTED) But, vfat_lookup() has interest to alias if it was non-anonymous. So, this adds vfat_d_anon_disconn() helper to check it correctly. Another bug is refcnt leak. It needs dput() for uninterested alias. Signed-off-by: OGAWA Hirofumi commit e55d1936f207f81c4e225d6c513e0fa487e544c5 Merge: 74d2e4f e7cc894 Author: Russell King Date: Sun Jan 10 17:33:56 2010 +0000 Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable commit a8dfb6462a033984b99fee4122fe0799a31f5bb4 Author: Uwe Kleine-König Date: Thu Jan 7 11:27:17 2010 +0100 imx: define functions to configure chip selects in the WEIM This has the addional effect that the macros CSCR_U, CSCR_L and CSCR_A are not used anymore in mach-pcm038.c and mach-qong.c. These still use the deprecated IO_ADDRESS macro and shouldn't be used in new code. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Dmitriy Taychenachev commit 3cdd54417d0f821825a353f7273d356399112f56 Author: Uwe Kleine-König Date: Fri Jan 8 16:02:30 2010 +0100 imx: properly protect mach/mx{1,[25][157x]}.h from multiple inclusion Some headers have used (now) wrong names or havn't had protection at all. This is needed before adding static inline functions to the headers. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Magnus Lilja Cc: Holger Schurig Cc: Jiri Kosina Cc: Daniel Mack commit 4631166124d928d3e9372a57b1477ce6335332c5 Author: Uwe Kleine-König Date: Fri Jan 8 12:29:11 2010 +0100 imx: remove unneeded include of mach/hardware.h This include isn't needed and hurts when defining static inline functions in mach/hardware.h (or files included by mach/hardware.h). The reason is that the consumers of mach/uncompress.h are compiled using -Dstatic= so the code for all inline function is included in e.g. arch/arm/boot/compressed/misc.o. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Jörg Knobloch Cc: Alan Carvalho de Assis Cc: Daniel Mack Cc: Dmitriy Taychenachev commit d13ab097ae9671be6765c7a8f1946641db5a7dac Author: Uwe Kleine-König Date: Tue Jan 5 11:27:42 2010 +0100 imx: remove mx1ads defconfig For some time now the defconfig for mx1ads produces a kernel for a versatile board. As CONFIG_ARCH_MX1ADS is included in the mx1 defconfig just get rid of mx1ads_defconfig. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer commit aae7019382896cf1075a93acc564e42601bc44a2 Author: Uwe Kleine-König Date: Thu Dec 17 17:17:54 2009 +0100 imx: only define deprecated symbols conditionally Define deprecated symbols in an #ifdef IMX_NEEDS_DEPRECATED_SYMBOLS ... All files that still depend on the old definitions get -DIMX_NEEDS_DEPRECATED_SYMBOLS passed to the compiler. When all remaining users are fixed this allows including the soc specific headers unconditionally. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Eric Benard Cc: Fabio Estevam Cc: Alan Carvalho de Assis Cc: Daniel Mack Cc: Alberto Panizzo Cc: Ilya Yanok Cc: Holger Schurig Cc: Jiri Kosina Cc: Magnus Lilja commit a9b7a2dd217bd43e122b604ec99b63e0211c38aa Author: Uwe Kleine-König Date: Thu Dec 17 11:56:43 2009 +0100 imx: mangle addresses after adding the offset don't use IO_ADDRESS($base) + $offset but IO_ADDRESS($base + $offset) Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Rabin Vincent Cc: "Agustín Ferrín Pozuelo" Cc: Javier Martin Cc: Valentin Longchamp Cc: Daniel Mack Cc: Dmitriy Taychenachev commit 59e2608169bf4199f9f9e08a8abe80132e9416f5 Author: Uwe Kleine-König Date: Wed Dec 16 19:08:09 2009 +0100 mx3/kzm_arm11_01: define and use board specific IO_ADDRESS macro Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King commit 6ef9af6871e3f220c6c7facf90babe6931d972bd Author: Uwe Kleine-König Date: Wed Dec 16 19:07:20 2009 +0100 imx35: define and use MX35_IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Jürgen Beisert Cc: Rabin Vincent Cc: Valentin Longchamp commit df9375fad4f99b28f5a500d9aa2cbb04e065ac97 Author: Uwe Kleine-König Date: Wed Dec 16 19:07:04 2009 +0100 imx25: redefine MX25_IO_ADDRESS using IMX_IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King commit 1273e7686f0c122bf58592c57387471c7f4eaa1b Author: Uwe Kleine-König Date: Wed Dec 16 19:06:12 2009 +0100 imx31: define and use MX31_IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Daniel Mack Cc: Greg Kroah-Hartman Cc: Mark Brown Cc: Magnus Lilja commit bc9ea6c7f5352f8857525b054bc3df784be1b8d5 Author: Uwe Kleine-König Date: Wed Dec 16 17:30:27 2009 +0100 imx27: define and use MX27_IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Rabin Vincent Cc: Javier Martin Cc: Valentin Longchamp Cc: Holger Schurig commit a3f5ac7838a93977f71288310336a725eb6e62db Author: Uwe Kleine-König Date: Wed Dec 16 17:29:39 2009 +0100 imx21: define and use MX21_IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Rabin Vincent Cc: Agustín Ferrín Pozuelo commit 1f2ddd64da6e53365102d831aa9e0446b78f0300 Author: Uwe Kleine-König Date: Wed Dec 16 19:05:04 2009 +0100 imx: provide helper macro to define IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Dmitriy Taychenachev commit 321ed164369bb5e4888eb24d70ebc64c232ffc31 Author: Uwe Kleine-König Date: Thu Dec 10 10:41:26 2009 +0100 imx/mx3: rename files defining a machine to mach-$mach.c While at it remove some superfluous parenthesis. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Daniel Mack Cc: Fabio Estevam Cc: Valentin Longchamp commit becc670a1bda8f240a93e45d9794f9f79713ffdb Author: Mark Brown Date: Mon Jan 4 18:24:50 2010 +0000 mx31ads: Allow enable/disable of switchable supplies They will be automatically powered off at startup so users will need to enable them for use. Signed-off-by: Mark Brown Signed-off-by: Sascha Hauer commit edc34a90613bbb393c019882f85b74f24066ca19 Author: Mark Brown Date: Mon Jan 4 18:24:49 2010 +0000 mx31ads: Convert 1133-EV1 to use dev_name to specify consumer devices This means we don't need to go running round working out struct devices at runtime. Signed-off-by: Mark Brown Signed-off-by: Sascha Hauer commit 386c5cf7a9a1d6856f17bde43174f751fac1bc0b Author: Uwe Kleine-König Date: Thu Dec 10 10:34:04 2009 +0100 imx/mx2: rename files defining a machine to mach-$mach.c Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Eric Benard commit f747f935431c796749752037b8cf7d3f76e96b47 Author: Uwe Kleine-König Date: Thu Dec 10 10:25:07 2009 +0100 imx: rename Kconfig symbol for "LogicPD MX27 LITEKIT platform" Not using MACH_IMX27LITE makes machine_is_imx27lite always return 0 independent of building support for this machine. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Daniel Schaeffer commit bc727390f0a7d7069a39cd97451fa890caa0010e Author: Uwe Kleine-König Date: Thu Dec 10 10:19:43 2009 +0100 imx: rename Kconfig symbol for "Eukrea CPUIMX27 module" Not using MACH_CPUIMX27 makes machine_is_cpuimx27 always return 0 independent of building support for this machine. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Jean Delvare Cc: Eric Benard commit 95c00464dda726c49ac8c45228bee8bf395ffa97 Author: Uwe Kleine-König Date: Wed Dec 9 20:12:07 2009 +0100 imx/mx1: rename files defining a machine to mach-$mach.c Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Paulius Zaleckas Cc: Darius Augulis Cc: Mauro Carvalho Chehab commit 5c4c62bcb27cf9200553edeaecac1ab8cc2add91 Author: Uwe Kleine-König Date: Wed Dec 9 20:09:35 2009 +0100 imx/mx1: add newline at end of Makefile Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Paulius Zaleckas Cc: Darius Augulis Cc: Mauro Carvalho Chehab commit 60d644cae9d96e13547c69fbac22e800790e6054 Author: Uwe Kleine-König Date: Wed Dec 9 19:52:57 2009 +0100 imx/mx3: rename clock.c and iomux.c to {clock,iomux}-imx31.c These files are only used on imx31. This makes the name consistent with the imx35 files. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Daniel Mack Cc: Fabio Estevam Cc: Valentin Longchamp commit f568dd7f5805bfa9e99f6df866300498b55eb8f4 Author: Uwe Kleine-König Date: Wed Dec 9 11:57:21 2009 +0100 imx/mach-mx3: use constants namespaced by the corresponding SOC (easy part) This just leaves cpu.c, devices.c and mm.c to clean up. As these files are used on more than one SOC they need some more work. Signed-off-by: Uwe Kleine-König Cc: Russell King Cc: Alberto Panizzo Cc: Valentin Longchamp Cc: Daniel Mack Cc: Guennadi Liakhovetski Cc: Yoichi Yuasa Cc: Mark Brown Cc: Magnus Lilja Cc: Fabio Estevam Cc: Sascha Hauer Cc: Harro Haan Cc: Jean Delvare Cc: Luotao Fu Cc: Ilya Yanok commit 3f35d1f5e4507ea4eb7ff5feaf624737c1b47631 Author: Uwe Kleine-König Date: Wed Dec 9 11:32:11 2009 +0100 imx/mach-mx2: use constants namespaced by the corresponding SOC (easy part) This just leaves devices.c, generic.c and serial.c to clean up. As these files are used on more than one SOC they need some more work. Signed-off-by: Uwe Kleine-König Cc: Holger Schurig Cc: Rabin Vincent Cc: Javier Martin Cc: Valentin Longchamp Cc: Jean Delvare Cc: Eric Benard Cc: Ivo Clarysse Cc: Vladimir Barinov Cc: Daniel Schaeffer Cc: Simon POLETTE Cc: Fabio Estevam Cc: Alan Carvalho de Assis Cc: Luotao Fu commit b70564686a3a3eac7c2da09722091dcf5b07d5a4 Author: Uwe Kleine-König Date: Fri Dec 11 09:57:27 2009 +0100 imx/clock-imx27: use a macro to define registers This way the base address isn't hard coded in each register definition Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Rabin Vincent Cc: Javier Martin Cc: Valentin Longchamp commit 318859fdff2caf4455749ff0097efb8f3e9b6879 Author: Uwe Kleine-König Date: Fri Dec 11 11:04:06 2009 +0100 imx/clock-imx21: use a macro to define registers This way the base address isn't hard coded in each register definition Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Rabin Vincent commit 5113f81520278ba17c64031fa01aeafc9a83f9d1 Author: Uwe Kleine-König Date: Fri Dec 11 10:07:15 2009 +0100 imx/mx2: fold crm_regs.h into its only consumer Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Rabin Vincent commit e7cc894120bb809738cebcd87b5ed3057bbe51fe Author: Uwe Kleine-König Date: Thu Dec 17 14:56:57 2009 +0100 [ARM] pxa/ttc_dkb: remove duplicate macro definition ARRAY_AND_SIZE is already defined arch/arm/mach-mmp/common.h which is already included. Signed-off-by: Uwe Kleine-König Cc: Russell King Cc: Bin Yang Acked-by: Haojian Zhuang Signed-off-by: Eric Miao commit e863c884cd18dca9533c352655af73d921f4a311 Author: Daniel Mack Date: Fri Nov 27 13:47:11 2009 +0100 [ARM] pxa/raumfeld: add defconfig Signed-off-by: Daniel Mack Signed-off-by: Eric Miao commit 550ee52d823845f882ddadcd032b33169866a739 Author: Daniel Mack Date: Fri Nov 27 13:47:09 2009 +0100 [ARM] pxa/raumfeld: add platform support This adds support for Raumfeld's 'Controller', 'Connector', 'Speaker S' and 'Speaker M' devices. They're all based on PXA303 SoCs. Signed-off-by: Daniel Mack Signed-off-by: Eric Miao