Srivatsa S. Bhat
e30e2fdfe5
VFS: Fix race between CPU hotplug and lglocks ...
Currently, the *_global_[un]lock_online() routines are not at all synchronized
with CPU hotplug. Soft-lockups detected as a consequence of this race was
reported earlier at https://lkml.org/lkml/2011/8/24/185 . (Thanks to Cong Meng
for finding out that the root-cause of this issue is the race condition
between br_write_[un]lock() and CPU hotplug, which results in the lock states
getting messed up).
Fixing this race by just adding {get,put}_online_cpus() at appropriate places
in *_global_[un]lock_online() is not a good option, because, then suddenly
br_write_[un]lock() would become blocking, whereas they have been kept as
non-blocking all this time, and we would want to keep them that way.
So, overall, we want to ensure 3 things:
1. br_write_lock() and br_write_unlock() must remain as non-blocking.
2. The corresponding lock and unlock of the per-cpu spinlocks must not happen
for different sets of CPUs.
3. Either prevent any new CPU online operation in between this lock-unlock, or
ensure that the newly onlined CPU does not proceed with its corresponding
per-cpu spinlock unlocked.
To achieve all this:
(a) We introduce a new spinlock that is taken by the *_global_lock_online()
routine and released by the *_global_unlock_online() routine.
(b) We register a callback for CPU hotplug notifications, and this callback
takes the same spinlock as above.
(c) We maintain a bitmap which is close to the cpu_online_mask, and once it is
initialized in the lock_init() code, all future updates to it are done in
the callback, under the above spinlock.
(d) The above bitmap is used (instead of cpu_online_mask) while locking and
unlocking the per-cpu locks.
The callback takes the spinlock upon the CPU_UP_PREPARE event. So, if the
br_write_lock-unlock sequence is in progress, the callback keeps spinning,
thus preventing the CPU online operation till the lock-unlock sequence is
complete. This takes care of requirement (3).
The bitmap that we maintain remains unmodified throughout the lock-unlock
sequence, since all updates to it are managed by the callback, which takes
the same spinlock as the one taken by the lock code and released only by the
unlock routine. Combining this with (d) above, satisfies requirement (2).
Overall, since we use a spinlock (mentioned in (a)) to prevent CPU hotplug
operations from racing with br_write_lock-unlock, requirement (1) is also
taken care of.
By the way, it is to be noted that a CPU offline operation can actually run
in parallel with our lock-unlock sequence, because our callback doesn't react
to notifications earlier than CPU_DEAD (in order to maintain our bitmap
properly). And this means, since we use our own bitmap (which is stale, on
purpose) during the lock-unlock sequence, we could end up unlocking the
per-cpu lock of an offline CPU (because we had locked it earlier, when the
CPU was online), in order to satisfy requirement (2). But this is harmless,
though it looks a bit awkward.
Debugged-by: Cong Meng <mc@linux.vnet.ibm.com>
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: stable@vger.kernel.org
2011-12-22 02:02:20 -05:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2011-11-04 18:02:25 -07:00
include: convert various register fcns to macros to avoid include chaining
2011-10-31 19:32:32 -04:00
headers, net: Use __kernel_sa_family_t in more definitions shared with userland
2011-08-26 12:02:50 -04:00
can: remove references to berlios mailinglist
2011-10-17 19:22:46 -04:00
libceph: Allocate larger oid buffer in request msgs
2011-11-11 09:50:19 -08:00
[media] DVB: increment minor version after addition of SYS_TURBO
2011-09-03 19:07:21 -03:00
Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6
2011-11-03 09:40:51 -07:00
Input: adp5589-keys - add support for the ADP5585 derivatives
2011-10-18 21:26:55 -07:00
regulator: TPS65910: Fix VDD1/2 voltage selector count
2011-11-23 14:03:52 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
2011-11-01 10:51:38 -07:00
mmc: core: Add quirk for long data read time
2011-12-10 16:18:35 -05:00
Merge git://git.infradead.org/mtd-2.6
2011-11-07 09:11:16 -08:00
headers, xtables: Add missing #include <linux/netfilter.h>
2011-08-26 12:02:50 -04:00
headers, netfilter: Use kernel type names __u8, __u16, __u32
2011-08-26 12:02:50 -04:00
netfilter: export NAT definitions through linux/netfilter_ipv4/nf_nat.h
2011-11-01 09:19:52 +01:00
headers, netfilter: Use kernel type names __u8, __u16, __u32
2011-08-26 12:02:50 -04:00
NFSD: Remove the ex_pathname field from struct svc_export
2011-09-13 22:44:10 -04:00
pinctrl: fix "warning: 'struct pinctrl_dev' declared inside parameter list"
2011-11-09 15:07:40 +01:00
drivers/leds/leds-renesas-tpu.c: move Renesas TPU LED driver platform data
2011-10-31 17:30:55 -07:00
power_supply: MAX17042: Support additional properties
2011-07-08 17:01:58 +04:00
md: load/store badblock list from v1.x metadata
2011-07-28 11:31:47 +10:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
ARM: CSR: add rtc i/o bridge interface for SiRFprimaII
2011-09-11 09:17:53 +08:00
backlight: fix broken regulator API usage in l4f00242t03
2011-10-31 17:30:54 -07:00
include: convert various register fcns to macros to avoid include chaining
2011-10-31 19:32:32 -04:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
net: remove SK_ROUTE_CAPS from meta ematch
2011-07-14 14:45:59 -07:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2011-10-31 15:42:54 -07:00
include: convert various register fcns to macros to avoid include chaining
2011-10-31 19:32:32 -04:00
Merge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2011-08-03 21:53:27 -10:00
PCI: PCIe AER: add aer_recover_queue
2011-07-22 08:25:37 -07:00
aio: allocate kiocbs in batches
2011-11-02 16:07:03 -07:00
alarmtimers: Add try_to_cancel functionality
2011-08-10 14:55:29 -07:00
anonfd: fix missing declaration
2011-07-20 20:47:43 -04:00
headers, net: Use __kernel_sa_family_t in more definitions shared with userland
2011-08-26 12:02:50 -04:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
mmc: atmel-mci: change namespace
2011-10-26 15:43:25 -04:00
mmc: atmel-mci: use ATMEL_PDC_SCND_BUF_OFF instead of a literal value
2011-10-26 15:43:26 -04:00
atomic: Update comments in atomic.h
2011-07-26 16:49:47 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
headers, net: Use __kernel_sa_family_t in more definitions shared with userland
2011-08-26 12:02:50 -04:00
writeback: Add a 'reason' to wb_writeback_work
2011-10-31 00:33:36 +08:00
drivers/gpio/gpio-generic.c: fix build errors
2011-09-14 18:09:38 -07:00
consolidate BINPRM_FLAGS_ENFORCE_NONDUMP handling
2011-07-20 01:43:10 -04:00
bio: change some signed vars to unsigned
2011-11-16 09:21:50 +01:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
Merge branch 'apei' into apei-release
2011-08-03 11:30:42 -04:00
block: Remove the control of complete cpu from bio.
2011-10-24 16:11:30 +02:00
block: initialize request_queue's numa node during
2011-11-23 10:59:13 +01:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
Input: add driver for Bosch Sensortec's BMA150 accelerometer
2011-08-09 01:33:04 -07:00
block: add bsg helper library
2011-07-31 22:05:09 +02:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
can: remove references to berlios mailinglist
2011-10-17 19:22:46 -04:00
net: allow CAP_NET_RAW to set socket options IP{,V6}_TRANSPARENT
2011-10-20 18:21:36 -04:00
memcg: replace ss->id_lock with a rwlock
2011-11-02 16:07:03 -07:00
clk: provide prepare/unprepare functions
2011-09-27 09:25:02 +01:00
ARM: 7131/1: clkdev: Add Common Macro for clk_lookup
2011-10-13 14:36:58 +01:00
clocksource: fixup ux500 build problems
2011-10-03 09:34:16 +02:00
clockevents: Add direct ktime programming function
2011-09-08 11:10:56 +02:00
time/clocksource: Fix kernel-doc warnings
2011-12-19 11:41:40 +01:00
connector: add comm change event report to proc connector
2011-09-28 13:41:50 -04:00
mm: compaction: make compact_zone_order() static
2011-10-31 17:30:49 -07:00
asm-generic/unistd.h: support new process_vm_{readv,write} syscalls
2011-12-03 15:31:48 -05:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
MAINTAINERS: Evgeniy has moved
2011-08-25 16:25:33 -07:00
PM / Sleep: Remove unused symbol 'suspend_cpu_hotplug'
2011-11-04 22:28:09 +01:00
cpu_pm: Add cpu power management notifiers
2011-09-23 12:05:29 +05:30
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2011-11-07 10:13:52 -08:00
cpumask: add cpumask_var_t documentation
2011-07-26 16:49:44 -07:00
[S390] kdump: Add size to elfcorehdr kernel parameter
2011-10-30 15:16:41 +01:00
cred: use 'const' in get_current_{user,groups}
2011-08-08 11:33:23 -07:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-08-06 22:12:37 -07:00
crypto: Add userspace report for cipher type algorithms
2011-10-21 14:24:07 +02:00
x86, olpc: Add XO-1 RTC driver
2011-07-06 14:44:42 -07:00
lib: make _tolower() public
2011-07-25 20:57:16 -07:00
fix apparmor dereferencing potentially freed dentry, sanitize __d_path() API
2011-12-06 23:57:18 -05:00
dcbnl: Aggregated CEE GET operation
2011-07-05 23:42:17 -07:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
PM / devfreq: fix private_data
2011-11-07 23:54:53 +01:00
dm table: add immutable feature
2011-10-31 20:19:04 +00:00
Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2011-11-21 20:36:26 -08:00
device_cgroup.h: delete needless include <linux/module.h>
2011-10-31 19:32:26 -04:00
dm table: add immutable feature
2011-10-31 20:19:04 +00:00
dm kcopyd: add dm_kcopyd_zero to zero an area
2011-10-31 20:18:58 +00:00
dm log userspace: add log device dependency
2011-10-31 20:21:24 +00:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2011-11-06 17:12:03 -08:00
iommu: Export intel_iommu_enabled to signal when iommu is in use
2011-12-16 08:49:57 -08:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
include/linux/dmar.h: forward-declare struct acpi_dmar_header
2011-10-31 17:30:44 -07:00
drbd: fix limit define, we support 1 PiByte now
2011-06-30 09:23:45 +02:00
drbd: Use angle brackets for system includes
2011-09-15 14:02:57 +02:00
dw_apb_timer: constify clocksource name
2011-10-04 13:08:18 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
edac: Move edac main structs to include/linux/edac.h
2011-10-31 15:10:04 -02:00
misc/eeprom: add driver for microwire 93xx46 EEPROMs
2011-07-25 20:57:16 -07:00
Merge branch 'pstore-efi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
2011-08-01 13:40:51 -10:00
block: drop @tsk from attempt_plug_merge() and explain sync rules
2011-10-19 14:33:08 +02:00
[S390] signal race with restarting system calls
2011-10-30 15:16:43 +01:00
net: Push protocol type directly down to header_ops->cache()
2011-07-13 02:29:59 -07:00
bonding: comparing a u8 with -1 is always false
2011-11-04 18:37:23 -04:00
evm: posix acls modify i_mode
2011-09-14 15:24:51 -04:00
module.h: split out the EXPORT_SYMBOL into export.h
2011-10-31 09:20:11 -04:00
ext2,ext3,ext4: don't inherit APPEND_FL or IMMUTABLE_FL for new inodes
2011-08-31 11:54:51 -04:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
2011-11-02 10:06:20 -07:00
ext3: Remove the obsolete broken EXT3_IOC32_WAIT_FOR_READONLY.
2011-10-10 18:25:59 +02:00
fault-injection: add ability to export fault_attr in arbitrary directory
2011-08-03 14:25:20 -10:00
fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlers
2011-07-20 20:47:59 -04:00
compat_ioctl: fix make headers_check regression
2011-07-07 08:18:18 +02:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
filter: use unsigned int to silence static checker warning
2011-10-19 19:35:51 -04:00
firewire: cdev: ABI documentation enhancements
2011-07-16 07:24:32 +02:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
PM / Freezer: Reimplement wait_event_freezekillable using freezer_do_not_count/freezer_count
2011-11-04 22:28:15 +01:00
vmscan: use atomic-long for shrinker batching
2011-12-09 07:50:27 -08:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
FS-Cache: Add a helper to bulk uncache pages on an inode
2011-07-07 13:21:56 -07:00
drivers/video: fsl-diu-fb: only DIU modes 0 and 1 are supported
2011-10-05 01:10:12 +00:00
drivers/virt: introduce Freescale hypervisor management driver
2011-07-08 00:21:27 -05:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
tracing: Restore system filter behavior
2011-12-05 13:28:45 -05:00
fuse: fix flock
2011-08-08 16:08:08 +02:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
lib, Make gen_pool memory allocator lockless
2011-08-03 11:15:57 -04:00
fs: take the ACL checks to common code
2011-07-25 14:30:23 -04:00
block: Revert "[SCSI] genhd: add a new attribute "alias" in gendisk"
2011-11-10 09:03:55 +01:00
mm: page_alloc: increase __GFP_BITS_SHIFT to include __GFP_OTHER_NODE
2011-08-03 14:25:21 -10:00
gpiolib: Ensure struct gpio is always defined
2011-10-24 16:04:06 +02:00
tty: n_gsm: Add raw-ip support
2011-07-01 15:34:45 -07:00
mm: make HASHED_PAGE_VIRTUAL page_address' struct page argument const.
2011-08-17 13:00:20 -07:00
include: convert various register fcns to macros to avoid include chaining
2011-10-31 19:32:32 -04:00
thp: mremap support and TLB optimization
2011-10-31 17:30:48 -07:00
hugetlb: remove dummy definitions of HPAGE_MASK and HPAGE_SIZE
2011-11-19 06:15:59 -05:00
perf: Add context field to perf_event
2011-07-01 11:06:38 +02:00
hwspinlock: Don't return a value in __hwspin_unlock
2011-11-08 09:28:27 +02:00
hv: remove struct hv_device_info from hyperv.h
2011-10-11 09:51:22 -06:00
I2C: OMAP: remove unused function pointers from pdata
2011-10-29 09:37:09 +01:00
i2c: Delete ANY_I2C_BUS
2011-11-23 11:33:07 +01:00
i8253: Cleanup outb/inb magic
2011-07-01 10:37:15 +02:00
ida: simplified functions for id allocation
2011-08-03 14:25:20 -10:00
mac80211: handle TDLS high-level commands and frames
2011-09-30 15:57:07 -04:00
net: introduce IFF_UNICAST_FLT private flag
2011-08-17 20:21:27 -07:00
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
2011-10-11 15:35:42 -04:00
if_link: Add additional parameter to IFLA_VF_INFO for spoof checking
2011-10-16 13:15:38 -07:00
macvtap: Fix the minor device number allocation
2011-10-21 02:53:07 -04:00
Repair wrong named definition aligned_u64
2011-10-03 14:03:48 -04:00
headers, pppol2tp: Use __kernel_pid_t in <linux/pppol2tp.h>
2011-08-26 12:02:50 -04:00
headers, net: Use __kernel_sa_family_t in more definitions shared with userland
2011-08-26 12:02:50 -04:00
vlan: allow nested vlan_do_receive()
2011-10-30 04:43:30 -04:00
integrity: move ima inode integrity data management
2011-07-18 12:29:38 -04:00
headers, net: Use __kernel_sa_family_t in more definitions shared with userland
2011-08-26 12:02:50 -04:00
net-netlink: Add a new attribute to expose TCLASS values via netlink
2011-11-14 01:08:49 -05:00
lro: do vlan cleanup
2011-07-21 13:47:54 -07:00
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-12-05 16:50:24 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
2011-10-28 14:25:01 -07:00
evm: permit mode bits to be updated
2011-09-14 15:24:52 -04:00
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-10-26 16:17:32 +02:00
genirq: Add IRQF_RESUME_EARLY and resume such IRQs earlier
2011-10-17 11:42:49 +02:00
Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux
2011-10-28 05:54:23 -07:00
CFQ: move think time check variables to a separate struct
2011-07-12 14:24:35 +02:00
Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next
2011-10-21 14:38:55 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
2011-07-31 14:30:59 -10:00
ip6_tunnel: add optional fwmark inherit
2011-09-20 14:50:00 -04:00
ipc: introduce shm_rmid_forced sysctl
2011-07-26 16:49:44 -07:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
headers, net: Use __kernel_sa_family_t in more definitions shared with userland
2011-08-26 12:02:50 -04:00
headers, net: Use __kernel_sa_family_t in more definitions shared with userland
2011-08-26 12:02:50 -04:00
irq: don't put module.h into irq.h for tracking irqgen modules.
2011-10-31 19:32:35 -04:00
irq_work: Use llist in the struct irq_work logic
2011-10-04 12:43:49 +02:00
irq: don't put module.h into irq.h for tracking irqgen modules.
2011-10-31 19:32:35 -04:00
irq: support domains with non-zero hwirq base
2011-10-31 14:03:23 +01:00
[SCSI] iscsi_ibft, be2iscsi, iscsi_boot: fix boot kobj data lifetime management
2011-06-29 16:43:06 -05:00
doc: fix broken references
2011-09-27 18:08:04 +02:00
jdb/jbd2: factor out common functions from the jbd[2] header files
2011-10-27 04:38:18 -04:00
jdb/jbd2: factor out common functions from the jbd[2] header files
2011-10-27 04:38:18 -04:00
jdb/jbd2: factor out common functions from the jbd[2] header files
2011-10-27 04:38:18 -04:00
time: Change jiffies_to_clock_t() argument type to unsigned long
2011-09-21 10:28:51 +02:00
jbd: change the field "b_cow_tid" of struct journal_head from type unsigned to tid_t
2011-07-25 17:24:47 +02:00
jump-label: initialize jump-label subsystem much earlier
2011-10-25 11:55:15 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
drivers/virt: introduce Freescale hypervisor management driver
2011-07-08 00:21:27 -05:00
kconfig: Introduce IS_ENABLED(), IS_BUILTIN() and IS_MODULE()
2011-07-29 21:53:30 +02:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree
2011-11-07 07:54:42 +10:30
Merge branch 'akpm' (Andrew's incoming)
2011-10-31 17:46:07 -07:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
locking, kprobes: Annotate the hash locks and kretprobe.lock as raw
2011-09-13 11:11:45 +02:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
Revert "KVM: PPC: Add support for explicit HIOR setting"
2011-11-17 16:30:25 +02:00
KVM: Fix simultaneous NMIs
2011-09-25 19:52:59 +03:00
headers, net: Use __kernel_sa_family_t in more definitions shared with userland
2011-08-26 12:02:50 -04:00
wan: make LAPB callbacks const
2011-09-16 19:20:20 -04:00
arch/arm/mach-ux500/board-u5500.c: calibrate ALS input voltage
2011-07-25 20:57:15 -07:00
VFS: Fix race between CPU hotplug and lglocks
2011-12-22 02:02:20 -05:00
lguest: use a special 1:1 linear pagetable mode until first switch.
2011-07-22 14:39:48 +09:30
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
lis3lv02d: make regulator API usage unconditional
2011-10-31 17:30:52 -07:00
headers, net: Use __kernel_sa_family_t in more definitions shared with userland
2011-08-26 12:02:50 -04:00
llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
2011-10-31 17:30:57 -07:00
rcu: Restore checks for blocking in RCU read-side critical sections
2011-09-28 21:36:37 -07:00
linux/log2.h: Fix rounddown_pow_of_two(1)
2011-12-12 22:06:55 -08:00
Merge branch 'for-3.2/drivers' of git://git.kernel.dk/linux-block
2011-11-04 17:22:14 -07:00
minix: describe usage of different magic numbers
2011-11-02 16:06:59 -07:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
memblock: add memblock_start_of_DRAM()
2011-10-31 17:30:47 -07:00
memcg: skip scanning active lists based on individual size
2011-11-02 16:07:00 -07:00
mm: Move definition of MIN_MEMORY_BLOCK_SIZE to a header
2011-07-12 11:08:01 +10:00
mm: extend memory hotplug API to allow memory hotplug in virtual machines
2011-07-25 20:57:08 -07:00
mii: Remove references to DP83840 PHY in mii.h
2011-09-15 15:36:34 -04:00
miscdevice.h: fix up implicit use of lists and types
2011-10-31 19:32:29 -04:00
vmscan: use atomic-long for shrinker batching
2011-12-09 07:50:27 -08:00
mm: thp: tail page refcounting fix
2011-11-02 16:06:57 -07:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
mm: vmscan: immediately reclaim end-of-LRU dirty pages when writeback completes
2011-10-31 17:30:47 -07:00
fs: seq_file - add event counter to simplify poll() support
2011-07-20 20:47:50 -04:00
Staging: hv: add driver_data to hv_vmbus_device_id
2011-08-25 10:25:37 -07:00
module.h: relocate MODULE_PARM_DESC into moduleparam.h
2011-10-31 09:20:11 -04:00
modules: add default loader hook implementations
2011-07-24 22:06:04 +09:30
module.h: relocate MODULE_PARM_DESC into moduleparam.h
2011-10-31 09:20:11 -04:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
2011-11-02 12:53:42 +01:00
net: validate HWTSTAMP ioctl parameters
2011-10-19 17:00:35 -04:00
net: Fix corruption in /proc/*/net/dev_mcast
2011-11-28 18:07:29 -05:00
headers, netfilter: Add missing #include <limits.h> for userland
2011-08-26 12:02:50 -04:00
headers, netfilter: Add missing #include <limits.h> for userland
2011-08-26 12:02:50 -04:00
headers, netfilter: Add missing #include <limits.h> for userland
2011-08-26 12:02:50 -04:00
Merge git://github.com/herbertx/crypto
2011-11-01 09:24:41 -07:00
netpoll: Remove unused EXPORT_SYMBOLs of netpoll_poll and netpoll_poll_dev
2011-07-03 20:02:07 -07:00
headers, ax25: Add missing #include to <linux/netrom.h>, <linux/rose.h>
2011-08-26 12:02:50 -04:00
NFC: Add dev_up and dev_down control operations
2011-09-20 14:43:49 -04:00
pnfsblock: add device operations
2011-07-31 12:18:16 -04:00
nfsd4: implement new 4.1 open reclaim types
2011-10-19 11:52:12 -04:00
nfs: when attempting to open a directory, fall back on normal lookup (try #5 )
2011-11-04 16:39:04 -04:00
NFS: Re-enable compilation of nfs with !CONFIG_NFS_V4 || !CONFIG_NFS_V4_1
2011-07-31 14:27:04 -10:00
NFS: Don't rely on PageError in nfs_readpage_release_partial
2011-10-19 13:58:38 -07:00
nfs: when attempting to open a directory, fall back on normal lookup (try #5 )
2011-11-04 16:39:04 -04:00
nl80211: Add sta_flags to the station info
2011-10-14 14:48:23 -04:00
cpusets: randomize node rotor used in cpuset_mem_spread_node()
2011-07-26 16:49:43 -07:00
notifiers: vt: move vt notifiers into vt.h
2011-07-25 20:57:15 -07:00
make sure that nsproxy_cache is initialized early enough
2011-07-20 01:44:07 -04:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
dt: include linux/errno.h in linux/of_address.h
2011-07-18 16:37:45 -06:00
Revert "dt: add of_alias_scan and of_alias_get_id"
2011-08-04 11:26:24 +01:00
of/gpio: export of_gpio_simple_xlate
2011-07-28 16:19:22 -06:00
of/irq: introduce of_irq_init
2011-10-31 14:03:22 +01:00
dt/net: add helper function of_get_phy_mode
2011-07-27 09:30:56 +08:00
of_platform.h: delete needless include <linux/module.h>
2011-10-31 19:32:27 -04:00
[media] omap3isp: ccdc: Use generic frame sync event instead of private HS_VS event
2011-08-29 12:38:51 -03:00
oom: fix race while temporarily setting current's oom_score_adj
2011-10-31 17:30:45 -07:00
PM / OPP: Fix build when CONFIG_PM_OPP is not set
2011-11-04 22:28:13 +01:00
locking, oprofile: Annotate oprofilefs lock as raw
2011-09-13 11:12:05 +02:00
Merge branch 'slub/lockless' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
2011-07-30 08:21:48 -10:00
mm: cleanup descriptions of filler arg
2011-07-25 20:57:10 -07:00
PCI: Fix compile errors with PCI_ATS and !PCI_IOV
2011-10-31 10:23:57 -07:00
PCI: Fix compile errors with PCI_ATS and !PCI_IOV
2011-10-31 10:23:57 -07:00
include: convert various register fcns to macros to avoid include chaining
2011-10-31 19:32:32 -04:00
x86, amd: Fix up numa_node information for AMD CPU family 15h model 0-0fh northbridge functions
2011-12-05 18:13:11 +01:00
PCI: Add support for PASID capability
2011-10-14 09:05:35 -07:00
locking, percpu_counter: Annotate ::lock as raw
2011-09-13 11:11:47 +02:00
perf: Fix loss of notification with multi-event
2011-12-05 09:33:03 +01:00
Add a personality to report 2.6.x version numbers
2011-08-25 10:17:28 -07:00
headers, net: Use __kernel_sa_family_t in more definitions shared with userland
2011-08-26 12:02:50 -04:00
net: hold sock reference while processing tx timestamps
2011-10-24 02:54:50 -04:00
tc: comment spelling fixes
2011-11-22 16:37:01 -05:00
Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6
2011-10-29 07:28:36 -07:00
plist: Remove the need to supply locks to plist heads
2011-07-08 14:02:53 +02:00
PM: Update comments describing device power management callbacks
2011-11-28 22:14:55 +01:00
PM: Move clock-related definitions and headers to separate file
2011-08-25 15:34:19 +02:00
PM / Domains: Split device PM domain data into base and need_restore
2011-09-26 20:22:02 +02:00
PM / QoS: Add function dev_pm_qos_read_value() (v3)
2011-10-04 21:54:26 +02:00
PM Sleep: Do not extend wakeup paths to devices with ignore_children set
2011-11-17 21:39:33 +01:00
pnfs-obj: pnfs_osd_xdr: Remove dead code and cleanup
2011-07-12 13:40:29 -04:00
mm/memblock.c: avoid abuse of RED_INACTIVE
2011-07-25 20:57:09 -07:00
alarmtimers: Remove period from alarm structure
2011-08-10 14:55:26 -07:00
RCUify freeing acls, let check_acl() go ahead in RCU mode if acl is cached
2011-08-03 00:58:42 -04:00
pps: new client driver using GPIO
2011-11-02 16:07:02 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
proc: make struct proc_dir_entry::name a terminal array rather than a pointer
2011-07-27 12:50:45 -07:00
locking, lib/proportions: Annotate prop_local_percpu::lock as raw
2011-09-13 11:11:50 +02:00
pstore: pass allocated memory region back to caller
2011-11-17 12:58:07 -08:00
PTI feature to allow user to name and mark masterchannel request.
2011-07-01 15:39:38 -07:00
ptp: fix L2 event message recognition
2011-09-29 00:32:03 -04:00
ptrace: dont send SIGSTOP on auto-attach if PT_SEIZED
2011-07-17 20:23:52 +02:00
backlight: add a callback 'notify_after' for backlight control
2011-08-25 16:25:34 -07:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
tmpfs radix_tree: locate_item to speed up swapoff
2011-08-03 14:25:24 -10:00
ramoops: make record_size a module parameter
2011-07-26 16:49:46 -07:00
Merge branch 'x86-rdrand-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2011-10-28 05:29:07 -07:00
locking, printk: Annotate logbuf_lock as raw
2011-09-13 11:11:54 +02:00
rcu: Fix wrong check in list_splice_init_rcu()
2011-07-20 14:10:20 -07:00
rcu: Move __rcu_read_unlock()'s barrier() within if-statement
2011-09-28 21:38:35 -07:00
rcu: Make TINY_RCU also use softirq for RCU_BOOST=n
2011-09-28 21:38:20 -07:00
rcu: Abstract common code for RCU grace-period-wait primitives
2011-09-28 21:36:42 -07:00
notifiers: sys: move reboot notifiers into reboot.h
2011-07-25 20:57:14 -07:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
fs: take the ACL checks to common code
2011-07-25 14:30:23 -04:00
reiserfs: use proper little-endian bitops
2011-07-25 20:57:17 -07:00
fs: take the ACL checks to common code
2011-07-25 14:30:23 -04:00
net:rfkill: add a gpio setup function into GPIO rfkill
2011-10-03 15:19:19 -04:00
trace: Add ring buffer stats to measure rate of events
2011-08-30 12:27:45 -04:00
RapidIO: add mport driver for Tsi721 bridge
2011-11-02 16:07:01 -07:00
rapidio: fix use of non-compatible registers
2011-08-25 16:25:34 -07:00
headers, net: Use __kernel_sa_family_t in more definitions shared with userland
2011-08-26 12:02:50 -04:00
rtc: Limit RTC PIE frequency
2011-07-26 14:50:01 -07:00
plist: Remove the need to supply locks to plist heads
2011-07-08 14:02:53 +02:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2011-07-25 13:56:39 -07:00
locking, rwsem: Annotate inner lock as raw
2011-09-13 11:11:59 +02:00
locking, rwsem: Annotate inner lock as raw
2011-09-13 11:11:59 +02:00
writeback: remove vm_dirties and task->dirties
2011-11-17 20:49:06 +08:00
include/linux/sdla.h: remove the prototype of sdla()
2011-07-18 11:06:03 -07:00
security: sparse fix: Move security_fixup_op to security.h
2011-09-09 16:56:33 -07:00
include/linux/sem.h: make sysv_sem empty if SYSVIPC is disabled
2011-11-02 16:07:01 -07:00
locking, semaphores: Annotate inner lock as raw
2011-09-13 11:11:57 +02:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
RS485: fix inconsistencies in the meaning of some variables
2011-11-15 12:13:44 -08:00
Revert "tty: serial8250: add helpers for the DesignWare 8250"
2011-08-24 15:25:49 -07:00
serial: Support the EFR-register of XR1715x uarts.
2011-09-22 15:50:38 -07:00
serial: Support the EFR-register of XR1715x uarts.
2011-09-22 15:50:38 -07:00
Merge branches 'sh/pm-runtime' and 'common/clkfwk' into sh-fixes-for-linus
2011-11-11 16:16:25 +09:00
include: convert various register fcns to macros to avoid include chaining
2011-10-31 19:32:32 -04:00
sh: clkfwk: Kill off remaining debugfs cruft.
2011-11-11 16:11:41 +09:00
net: sh_eth: move the asm/sh_eth.h to include/linux/
2011-09-28 13:41:51 -04:00
ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h
2011-11-11 16:45:35 +09:00
shm: handle separate PID namespaces case
2011-07-30 08:44:19 -10:00
tmpfs: use kmemdup for short symlinks
2011-08-03 14:25:24 -10:00
vmscan: use atomic-long for shrinker batching
2011-12-09 07:50:27 -08:00
firmware: Sigma: Fix endianess issues
2011-11-29 11:59:50 +00:00
include: linux: skbuf.h: Fix parameter documentation
2011-11-01 00:55:48 -04:00
slab allocators: Provide generic description of alignment defines
2011-07-07 21:04:12 +03:00
slab: shrink sizeof(struct kmem_cache)
2011-07-20 20:27:56 +03:00
slub: correct comments error for per cpu partial
2011-09-27 23:03:30 +03:00
tcp: Change possible SYN flooding messages
2011-09-15 14:49:43 -04:00
net: Make userland include of netlink.h more sane.
2011-08-07 22:48:07 -07:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
tmpfs: clone shmem_file_splice_read()
2011-07-25 20:57:11 -07:00
stmmac: unify MAC and PHY configuration parameters (V2)
2011-07-21 15:29:16 -07:00
stop_machine.h: fix implicit use of smp.h for smp_processor_id
2011-10-31 19:32:28 -04:00
lib/string.c: introduce memchr_inv()
2011-10-31 17:30:47 -07:00
net: Fix sungem_phy sharing.
2011-08-16 00:16:49 -07:00
PM / VT: Cleanup #if defined uglyness and fix compile error
2011-10-16 23:28:51 +02:00
mm: change isolate mode from #define to bitwise type
2011-10-31 17:30:44 -07:00
mm: let swap use exceptional entries
2011-08-03 14:25:22 -10:00
Cross Memory Attach
2011-10-31 17:30:44 -07:00
sysctl: add support for poll()
2011-11-02 16:07:02 -07:00
sysdev.h: dont include <linux/module.h> for no reason
2011-10-31 19:32:24 -04:00
sysfs: Implement support for tagged files in sysfs.
2011-10-19 19:24:14 -04:00
tcp: report ECN_SEEN in tcp_info
2011-10-03 14:01:21 -04:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
thermal: make THERMAL_HWMON implementation fully internal
2011-08-02 14:51:57 -04:00
drivers:misc:ti-st: platform hooks for chip states
2011-08-22 14:13:32 -07:00
headers, tipc: Add missing #include to <linux/tipc_config.h> for userland
2011-08-26 12:02:50 -04:00
sched: Allow SD_NODES_PER_DOMAIN to be overridden
2011-09-20 15:53:21 +10:00
tracing: Add a counter clock for those that do not trust clocks
2011-09-19 11:35:58 -04:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
Tracepoint: Dissociate from module mutex
2011-08-10 20:38:14 -04:00
Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
2011-10-26 15:11:09 +02:00
TTY: pty, fix pty counting
2011-08-23 10:10:38 -07:00
rcu: Move rcu_head definition to types.h
2011-09-28 21:36:38 -07:00
Input: force feedback - potential integer wrap in input_ff_create()
2011-10-12 21:13:11 -07:00
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
headers, net: Use __kernel_sa_family_t in more definitions shared with userland
2011-08-26 12:02:50 -04:00
include: convert various register fcns to macros to avoid include chaining
2011-10-31 19:32:32 -04:00
sysctl: add support for poll()
2011-11-02 16:07:02 -07:00
uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
2011-10-31 19:32:31 -04:00
vermagic: delete unused include of <linux/module.h>
2011-10-31 19:32:23 -04:00
[media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control
2011-11-03 18:29:09 -02:00
virtio.h: correct comment for struct virtio_driver
2011-11-02 11:40:59 +10:30
virtio-pci: make reset operation safer
2011-11-24 13:04:48 +10:30
virtio-mmio: Correct the name of the guest features selector
2011-11-24 13:04:47 +10:30
virtio: modify vring_init and vring_size to take account of the layout containing *_event_idx
2011-11-02 11:40:59 +10:30
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
xen: map foreign pages for shared rings by updating the PTEs directly
2011-11-16 12:13:08 -05:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
notifiers: vt: move vt notifiers into vt.h
2011-07-25 20:57:15 -07:00
panic, vt: do not force oops output when panic_timeout < 0
2011-07-26 16:49:45 -07:00
watchdog: WatchDog Timer Driver Core - Add minimum and max timeout
2011-07-28 08:01:18 +00:00
Input: wm97xx - refactor channel selection in poll_sample()
2011-07-04 19:31:38 -07:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
writeback: Add a 'reason' to wb_writeback_work
2011-10-31 00:33:36 +08:00
headers, net: Use __kernel_sa_family_t in more definitions shared with userland
2011-08-26 12:02:50 -04:00
evm: posix acls modify i_mode
2011-09-14 15:24:51 -04:00
e30e2fdfe5