15 Apr, 2009
11 commits
-
Interrupts must be disabled when taking the IPI lock.
Caught by lockdep.
Reported-by: Meelis Roos
Signed-off-by: David S. Miller -
* 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
drm/i915: fix scheduling while holding the new active list spinlock
drm/i915: Allow tiling of objects with bit 17 swizzling by the CPU.
drm/i915: Correctly set the write flag for get_user_pages in pread.
drm/i915: Fix use of uninitialized var in 40a5f0de
drm/i915: indicate framebuffer restore key in SysRq help message
drm/i915: sync hdmi detection by hdmi identifier with 2D
drm/i915: Fix a mismerge of the IGD patch (new .find_pll hooks missed)
drm/i915: Implement batch and ring buffer dumping -
Revert part of af5c820a3169e81af869c113e18ec7588836cd50 ("x86: cpumask:
use work_on_cpu in arch/x86/kernel/microcode_core.c")That change is causing only one Intel CPU's microcode to be updated e.g.
microcode: CPU3 updated from revision 0x9 to 0x17, date = 2005-04-22
where before it announced that also for CPU0 and CPU1 and CPU2.We cannot use work_on_cpu() in the CONFIG_MICROCODE_OLD_INTERFACE code,
because Intel's request_microcode_user() involves a copy_from_user() from
/sbin/microcode_ctl, which therefore needs to be on that CPU at the time.Signed-off-by: Hugh Dickins
Signed-off-by: Linus Torvalds -
regression caused by commit 5e118f4139feafe97e913df67b1f7c1e5083e535:
i915_gem_object_move_to_inactive() should be called in task context,
as it calls fput();Signed-off-by: Shaohua Li
[anholt: Add more detail to the comment about the lock break that's added]
Signed-off-by: Eric Anholt -
…/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:
lockdep: warn about lockdep disabling after kernel taint, fix -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: fix "direct_io" private mmap
fuse: fix argument type in fuse_get_user_pages() -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
nilfs2: fix possible mismatch of sufile counters on recovery
nilfs2: segment usage file cleanups
nilfs2: fix wrong accounting and duplicate brelse in nilfs_sufile_set_error
nilfs2: simplify handling of active state of segments fix
nilfs2: remove module version
nilfs2: fix lockdep recursive locking warning on meta data files
nilfs2: fix lockdep recursive locking warning on bmap
nilfs2: return f_fsid for statfs2 -
* 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Add missing FILE tag to MAINTAINERS
microblaze: remove duplicated #include's
microblaze: struct device - replace bus_id with dev_name()
microblaze: Simplify copy_thread()
microblaze: Add TIMESTAMPING constants to socket.h
microblaze: Add missing empty ftrace.h file
microblaze: Fix problem with removing zero length files -
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Add in PCI bus for DMA API debugging.
sh: Pre-allocate a reasonable number of DMA debug entries.
sh: sh7786: modify usb setup timeout judgment bug.
MAINTAINERS: Update sh architecture file patterns.
sh: ap325: use edge control for ov772x camera
sh: Plug in support for ARCH=sh64 using sh SRCARCH.
sh: urquell: Fix up address mapping in board comments.
sh: Add support for DMA API debugging.
sh: Provide cpumask_of_pcibus() to fix NUMA build.
sh: urquell: Add board comment
sh: wire up sys_preadv/sys_pwritev() syscalls.
sh: sh7785lcr: fix PCI address map for 32-bit mode
sh: intc: Added resume from hibernation support to the intc -
Fix lpfc_parse_bg_err()'s use of do_div(). It should be passing a 64-bit
variable as the first parameter. However, since it's only using a 32-bit
variable, it doesn't need to use do_div() at all, but can instead use the
division operator.This deals with the following warnings:
CC drivers/scsi/lpfc/lpfc_scsi.o
drivers/scsi/lpfc/lpfc_scsi.c: In function 'lpfc_parse_bg_err':
drivers/scsi/lpfc/lpfc_scsi.c:1397: warning: comparison of distinct pointer types lacks a cast
drivers/scsi/lpfc/lpfc_scsi.c:1397: warning: right shift count >= width of type
drivers/scsi/lpfc/lpfc_scsi.c:1397: warning: passing argument 1 of '__div64_32' from incompatible pointer typeSigned-off-by: David Howells
Signed-off-by: Linus Torvalds
14 Apr, 2009
29 commits
-
Updates some usb_serial_port members documentation.
Signed-off-by: Leandro Dorileo
Signed-off-by: Alan Cox
Signed-off-by: Linus Torvalds -
In commit 51dcdfec6a274afc1c6fce180d582add9ff512c0 ("parport: Use the
PCI IRQ if offered") parport_pc_probe_port() gained an irqflags arg.
This isn't being supplied on powerpc. This patch make powerpc fallback
to the old behaviour, that is using "0" for irqflags.Fixes build failure:
In file included from drivers/parport/parport_pc.c:68:
arch/powerpc/include/asm/parport.h: In function 'parport_pc_find_nonpci_ports':
arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port'
arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port'
arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port'
make[3]: *** [drivers/parport/parport_pc.o] Error 1Signed-off-by: Tony Breeds
Signed-off-by: Alan Cox
Signed-off-by: Linus Torvalds -
These got overlooked first time around.
Signed-off-by: Alan Cox
Signed-off-by: Linus Torvalds -
If the ti-usb adapter returns an zero data length frame (which happens)
then we leak a kref. Found by Christoph Mair
who proposed a patch. The patch here is different as Christoph's patch
didn't work for the case where tty = NULL and data arrived but Christoph
did all the hard work chasing it down.Signed-off-by: Alan Cox
Signed-off-by: Linus Torvalds -
ACM sets the low latency flag but calls the flip buffer routines from
IRQ context which isn't permitted (and as of 2.6.29 causes a warning
hence this one was caught)Fortunatelt ACM doesn't need to set this flag in the first place as it
only set it to work around problems in ancient (pre tty flip rewrite)
kernels.Reported-by: Chuck Ebbert
Signed-off-by: Alan Cox
Signed-off-by: Linus Torvalds -
Signed-off-by: Michal Simek
-
Impact: build fix for Sparc and s390
Stephen Rothwell reported that the Sparc build broke:
In file included from kernel/panic.c:12:
include/linux/debug_locks.h: In function '__debug_locks_off':
include/linux/debug_locks.h:15: error: implicit declaration of function 'xchg'due to:
9eeba61: lockdep: warn about lockdep disabling after kernel taint
There is some inconsistency between architectures about where exactly
xchg() is defined.The traditional place is in system.h but the more logical point for it
is in atomic.h - where most architectures (especially new ones) have
it defined. These architecture also still offer it via system.h.Some, such as Sparc or s390 only have it in asm/system.h and not available
via asm/atomic.h at all.Use the widest set of headers in debug_locks.h and also include asm/system.h.
Reported-by: Stephen Rothwell
Cc: Frederic Weisbecker
Cc: "David S. Miller"
Cc: Linus Torvalds
LKML-Reference:
Signed-off-by: Ingo Molnar -
Remove duplicated #include's in
arch/microblaze/include/asm/io.h
arch/microblaze/kernel/prom.c
arch/microblaze/kernel/ptrace.c
arch/microblaze/kernel/signal.c
arch/microblaze/kernel/sys_microblaze.cSigned-off-by: Huang Weiyi
Signed-off-by: Michal Simek -
Signed-off-by: Michal Simek
-
Removing nr parameter from copy_tread function
commit 6f2c55b843836d26528c56a0968689accaedbc67Signed-off-by: Michal Simek
-
This changes was introduce with
commit: cb9eff097831007afb30d64373f29d99825d0068net: new user space API for time stamping of incoming and outgoing packets
Signed-off-by: Michal Simek
-
Signed-off-by: Michal Simek
-
Adding one new line was recommended solution.
Test with make distcleanTested-by: Jeff Garzik
Signed-off-by: Michal Simek -
This adds in the pci_bus_type for DMA API debug.
Signed-off-by: Paul Mundt
-
This prevents the DMA API debugging from running out of entries right
away on boot. Defines 4096 entries by default, which while a bit on the
heavy side, ought to leave enough breathing room for some time.Signed-off-by: Paul Mundt
-
…s/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
tomoyo: version bump to 2.2.0.
tomoyo: add Documentation/tomoyo.txt -
We ended up incorrectly using '&cur' instead of '&readin' in the
work_on_cpu() -> smp_call_function_single() transformation in commit
01599fca6758d2cd133e78f87426fc851c9ea725 ("cpufreq: use
smp_call_function_[single|many]() in acpi-cpufreq.c").Andrew explains:
"OK, the acpi tree went and had conflicting changes merged into it after
I'd written the patch and it appears that I incorrectly reverted part
of 18b2646fe3babeb40b34a0c1751e0bf5adfdc64c while fixing the resulting
rejects.Switching it to `readin' looks correct."
Acked-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Signed-off-by: Kentaro Takeda
Signed-off-by: Tetsuo Handa
Signed-off-by: Toshiharu Harada
Signed-off-by: James Morris -
Signed-off-by: Kentaro Takeda
Signed-off-by: Tetsuo Handa
Signed-off-by: Toshiharu Harada
Signed-off-by: James Morris -
* 'for-rc1/xen/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
xen: add FIX_TEXT_POKE to fixmap
xen: honour VCPU availability on boot
xen: clean up gate trap/interrupt constants
xen: set _PAGE_NX in __supported_pte_mask before pagetable construction
xen: resume interrupts before system devices.
xen/mmu: weaken flush_tlb_other test
xen/mmu: some early pagetable cleanups
Xen: Add virt_to_pfn helper function
x86-64: remove PGE from must-have feature list
xen: mask XSAVE from cpuid
NULL noise: arch/x86/xen/smp.c
xen: remove xen_load_gdt debug
xen: make xen_load_gdt simpler
xen: clean up xen_load_gdt
xen: split construction of p2m mfn tables from registration
xen: separate p2m allocation from setting
xen: disable preempt for leave_lazy_mmu -
This corrects a race with the PHY RST bit not being set properly if the
PLL status changes right before timeout. This resulted in it potentially
failing even if the device came up in time.Special thanks to Mr. Juha Leppanen and Iwamatsu-san for reporting this
out and reviewing it.Reported-by: Juha Leppanen
Reviewed-by: Nobuhiro Iwamatsu
Tested-by: Paul Mundt
Signed-off-by: Kuninori Morimoto
Signed-off-by: Paul Mundt -
The edac-core driver includes code which assumes that the work_struct
which is included in every delayed_work is the first member of that
structure. This is currently the case but might change in the future, so
use to_delayed_work() instead, which doesn't make such an assumption.linux-2.6.30-rc1 has the to_delayed_work() function that will allow this
patch to workSigned-off-by: Jean Delvare
Signed-off-by: Doug Thompson
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Fix the edac local pci_write_bits32 to properly note the 'escape' mask if
all ones in a 32-bit word.Currently no consumer of this function uses that mask, so there is no
danger to existing code.Signed-off-by: Jeff Haran
Signed-off-by: Doug Thompson
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Introduce xpc_arch_ops and eliminate numerous individual global definitions.
Signed-off-by: Robin Holt
Cc: Dean Nelson
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
sgi-xpc has a window of failure where an open message can be sent and a
subsequent data message can get lost. We have added a new message
(opencomplete) which closes that window.Signed-off-by: Robin Holt
Signed-off-by: Dean Nelson
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
The heartbeat timeout functionality in sgi-xpc is currently not trained to
the connection time. If a connection is made and the code is in the last
polling window prior to doing a timeout, the next polling window will see
the heartbeat as unchanged and initiate a no-heartbeat disconnect.Signed-off-by: Robin Holt
Signed-off-by: Dean Nelson
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Dean has moved on to other work. His responsibilities for XP/XPC/XPNET
have been handed to me.Signed-off-by: Robin Holt
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Use the default mountpoint of debugfs in the pktcdvd ABI.
Signed-off-by: Shen Feng
Cc:
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
The description about various statistics from memory.stat is not accurate
and confusing at times.Correct this along with a few other minor cleanups.
Signed-off-by: Bharata B Rao
Acked-by: Balbir Singh
Acked-by: KAMEZAWA Hiroyuki
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
