| Age | Commit message (Collapse) | Author |
|---|
|
|
|
Conflicts:
drivers/media/video/v4l2-device.c
drivers/net/wimax/i2400m/usb-notif.c
drivers/sh/maple/maple.c
|
|
Conflicts:
drivers/xen/manage.c
|
|
Conflicts:
Documentation/kernel-parameters.txt
MAINTAINERS
include/linux/percpu.h
init/main.c
kernel/module.c
lib/Kconfig.debug
mm/slob.c
mm/vmalloc.c
|
|
|
|
Conflicts:
arch/x86/Kconfig
drivers/pci/intel-iommu.c
|
|
Conflicts:
security/selinux/hooks.c
|
|
|
|
Conflicts:
Documentation/kernel-parameters.txt
arch/x86/Kconfig
lib/Makefile
|
|
|
|
|
|
|
|
|
|
Conflicts:
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/sysfs.c
arch/x86/include/asm/topology.h
arch/x86/kernel/cpu/cpufreq/powernow-k8.c
arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
arch/x86/lguest/boot.c
arch/x86/mach-default/setup.c
arch/x86/mach-voyager/setup.c
drivers/firmware/dcdbas.c
drivers/media/video/saa7134/saa7134-core.c
drivers/media/video/saa7134/saa7134.h
drivers/net/virtio_net.c
kernel/module.c
|
|
Conflicts:
arch/x86/include/asm/timer.h
|
|
Conflicts:
drivers/mtd/maps/Makefile
|
|
Conflicts:
drivers/infiniband/hw/cxgb3/cxio_hal.h
drivers/infiniband/hw/nes/nes_nic.c
include/linux/netfilter/xt_limit.h
include/linux/netfilter/xt_statistic.h
|
|
|
|
Conflicts:
drivers/ide/ide-dma.c
drivers/ide/ide-floppy.c
include/linux/ide.h
|
|
|
|
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/i2c/busses/i2c-mpc.c
|
|
Conflicts:
Documentation/feature-removal-schedule.txt
|
|
|
|
Conflicts:
lib/Makefile
|
|
|
|
Conflicts:
kernel/irq/handle.c
|
|
|
|
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/intel_cacheinfo.c
|
|
Conflicts:
arch/x86/kernel/pci-nommu.c
lib/Kconfig.debug
|
|
Conflicts:
arch/powerpc/include/asm/elf.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
arch/arm/include/asm/elf.h
arch/arm/kernel/module.c
sound/soc/pxa/pxa2xx-i2s.c
|
|
|
|
|
|
|
|
Waiting for a free bus now accepts the timeout value in jiffies and does
proper checking using time_before.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
|
|
Use the functions introduced in by the previous patch,
suspend_device_irqs(), resume_device_irqs() and check_wakeup_irqs(),
to rework the handling of interrupts during suspend (hibernation) and
resume. Namely, interrupts will only be disabled on the CPU right
before suspending sysdevs, while device drivers will be prevented
from receiving interrupts, with the help of the new helper function,
before their "late" suspend callbacks run (and analogously during
resume).
In addition, since the device interrups are now disabled before the
CPU has turned all interrupts off and the CPU will ACK the interrupts
setting the IRQ_PENDING bit for them, check in sysdev_suspend() if
any wake-up interrupts are pending and abort suspend if that's the
case.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Ingo Molnar <mingo@elte.hu>
|
|
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Setting ->owner as done currently (pde->owner = THIS_MODULE) is racy
as correctly noted at bug #12454. Someone can lookup entry with NULL
->owner, thus not pinning enything, and release it later resulting
in module refcount underflow.
We can keep ->owner and supply it at registration time like ->proc_fops
and ->data.
But this leaves ->owner as easy-manipulative field (just one C assignment)
and somebody will forget to unpin previous/pin current module when
switching ->owner. ->proc_fops is declared as "const" which should give
some thoughts.
->read_proc/->write_proc were just fixed to not require ->owner for
protection.
rmmod'ed directories will be empty and return "." and ".." -- no harm.
And directories with tricky enough readdir and lookup shouldn't be modular.
We definitely don't want such modular code.
Removing ->owner will also make PDE smaller.
So, let's nuke it.
Kudos to Jeff Layton for reminding about this, let's say, oversight.
http://bugzilla.kernel.org/show_bug.cgi?id=12454
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
|
|
|
|
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
|
|
If we fix a few highmem-related thinkos and a couple of printk format
warnings, the Intel IOMMU driver works fine in a 32-bit kernel.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
|
|
This file uses PCI MSI defines and so needs pci.h.
Tested-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
|
