[XFS updates] XFS development tree branch, mainline, updated. v2.6.28-rc3-1204-g061e41f
xfs at oss.sgi.com
xfs at oss.sgi.com
Mon Dec 1 23:58:10 CST 2008
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "XFS development tree".
The branch, mainline has been updated
061e41f Linux 2.6.28-rc7
0d81514 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
9c84ba4 drivers/gpu/drm/i915/i915_irq.c: fix warning
09a8126 i82875p_edac: fix module remove
307d114 i82875p_edac: fix overflow device resource setup
bca404a fbdev: fix FB console blanking
0380155 ntfs: don't fool kernel-doc
ced6909 kernel-doc: handle varargs cleanly
6ff2d39 lib/idr.c: fix rcu related race with idr_find
1d678f3 DMA-API.txt: fix description of pci_map_sg/dma_map_sg scatterlists handling
4280e31 frv: fix mmap2 error handling
a800599 taint: add missing comment
c4c6fa9 radeonfb: fix problem with color expansion & alignment
b93c35f spi: fix spi_s3c24xx_gpio num_chipselect
e39ea8a spi: fix spi_s3c24xx_gpio device handle lookup
4e253d2 spi: au1550_spi full duplex dma fix
6a010b5 spi: fix spi_imx probe oopsing
7ef9964 epoll: introduce resource usage limits
b7d271d spi: mpc52xx_psc_spi chipselect bugfix
aaacf4b spi: avoid spidev crash when device is removed
dc8c214 spi documentation: use __initdata on struct
dc924ef hwmon: applesmc: make applesmc load automatically on startup
36be47d parport_serial: fix array overflow
dc19f9d memcg: memory hotplug fix for notifier callback
b29acbd mm: vmalloc fix lazy unmapping cache aliasing
8650e51 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
d6b58f8 ocfs2: fix regression in ocfs2_read_blocks_sync()
07d9a39 ocfs2: fix return value set in init_dlmfs_fs()
a2eee69 ocfs2: Small documentation update
07f9eeb ocfs2: fix wake_up in unlock_ast
66f502a ocfs2: initialize stack_user lvbptr
3b5da01 ocfs2: comments typo fix
a693b0c em28xx: remove backward compat macro added on a previous fix
7ac0110 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
484ab62 V4L/DVB (9748): em28xx: fix compile warning
faa3bd2 V4L/DVB (9743): em28xx: fix oops audio
4bc2a9b Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
ac70a96 libata: blacklist Seagate drives which time out FLUSH_CACHE when used with NCQ
03f6084 [libata] pata_rb532_cf: fix signature of the xfer function
9f14786 [libata] pata_rb532_cf: fix and rename register definitions
1eedb4a ata_piix: add borked Tecra M4 to broken suspend list
b0f43dc Merge branches 'ehca' and 'mlx4' into for-linus
42ab01c IB/mlx4: Fix MTT leakage in resize CQ
7ec4f46 IB/ehca: Fix problem with generated flush work completions
6b1f9d6 IB/ehca: Change misleading error message on memory hotplug
6a12141 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
c07f62e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
e540458 Add kref to fake tty used by USB console
296fa7f drivers/char/tty_io.c: Avoid panic when no console is configured.
b4dcfbe Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
ecf318c Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
2a1dc50 vmscan: protect zone rotation stats by lru lock
33b07db Revert "of_platform_driver noise on sparce"
5bb4bd9 USB: serial: add more Onda device ids to option driver
621b239 USB: usb-storage: unusual_devs entry for Nikon D2H
a6b7b03 USB: storage: unusual_devs entry for Mio C520-GPS
1f15a50 USB: fsl_usb2_udc: Report disconnect before unbinding
9ac36da USB: fsl_qe_udc: Report disconnect before unbinding
0a99e8a USB: fix SB600 USB subsystem hang bug
269f053 Revert "USB: improve ehci_watchdog's side effect in CPU power management"
a1e0eb1 powerpc: Fix build for 32-bit SMP configs
d9d060a Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
03cfdb8 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
4ec8f07 Merge master.kernel.org:/home/rmk/linux-2.6-arm
151903d drm/i915: Fix copy'n'pasteo that broke VT switch if flushing was non-empty.
ab598b6 powerpc: Fix system calls on Cell entered with XER.SO=1
960cedb powerpc/cell: Fix GDB watchpoints, again
cc353c3 powerpc/mpic: Don't reset affinity for secondary MPIC on boot
d015fe9 powerpc/cell/axon-msi: Retry on missing interrupt
4a61866 powerpc: Fix boot freeze on machine with empty memory node
4b824de powerpc: Fix IRQ assignment for some PCIe devices
a6e470f Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
8e36a5d Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
9bd062d Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
72244c0 Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
93b1005 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
7bbc67f Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
66a45cc Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
8639dad Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
9297524 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
8c7b905 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
1838e39 Trivial Documentation/filesystems/ramfs-rootfs-initramfs.txt fix
42182c78 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
e2a2444 Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
8decec7 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
499c59c MN10300: Tighten up the code using case ranges
f1ba3bc Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
95c5e1f Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
b31a0fe Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
96b8936 remove __ARCH_WANT_COMPAT_SYS_PTRACE
16799c6 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
211f05a input: replace spin_lock_bh with spin_lock_irqsave in ml_ff_playback
02d0e67 hotplug_memory_notifier section annotation
d3a307f sn_pci_controller_fixup() should be __init
ffb78a2 get xenbus_driver ->probe() "recognized" by modpost
df6b079 xen_play_dead() is __cpuinit
37af46e xen_setup_vcpu_info_placement() is not init on x86
23a14b9 kvm_setup_secondary_clock() is cpuinit
2236d25 enable_IR_x2apic() needs to be __init
ad04d31 pci_setup() is init, not devinit
4bcc17d alpha: pcibios_resource_to_bus() is callable from normal code
56d74dd tricky one: hisax sections
8419641 cpuinit fixes in kernel/*
b038514 uninorth-agp section mess
37d33d1 rapidio section noise
f57628d section errors in smc911x/smc91x
5bac287 fix the section noise in sparc head.S
1c4567a m32r: section noise in head.S
8814b50 section misannotation in ibmtr_cs
43ced65 ixgbe section fixes
31421a6 rackmeter section fixes
ced7172 gdth section fixes
e669dae of_platform_driver noise on sparce
3003781 advansys fix on ISA-less configs
2fceab0 W1_MASTER_DS1WM should depend on HAVE_CLK
d16d766 icside section warnings
596f103 fix talitos
6005e3e istallion section warnings
8c29890 sparc64 trivial section misannotations
409832f sparc32 cpuinit flase positives
4ea8fb9 powerpc set_huge_psize() false positive
7d6a8a1 false __cpuinit positives on alpha
3116848 meminit section warnings
af6d596 sched: prevent divide by zero error in cpu_avg_load_per_task, update
1583715 sched, cpusets: fix warning in kernel/cpuset.c
2642b11 ieee1394: sbp2: fix race condition in state change
e47c1fe ieee1394: fix list corruption (reported at module removal)
9a5aa62 mlx4_core: Save/restore default port IB capability mask
23d0a65 toshiba_acpi: close race in toshiba_acpi driver
7b964f7 i2c-parport: Fix misplaced parport_release call
79b93e1 i2c: Remove i2c clients in reverse order
d1846b0 i2c/isp1301_omap: Build fixes
ee8a1a0 HID: Apple ALU wireless keyboards are bluetooth devices
af38d90 Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
487ff32 Allow architectures to override copy_user_highpage()
52b19ac udf: Fix BUG_ON() in destroy_inode()
a730b32 [ARM] pxa/palmtx: misc fixes to use generic GPIO API
b627c8b x86: always define DECLARE_PCI_UNMAP* macros
6417a91 Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
abd9421 [S390] Update default configuration.
0778dc3 [S390] Fix alignment of initial kernel stack.
2944a5c [S390] pgtable.h: Fix oops in unmap_vmas for KVM processes
8107d82 [S390] fix/cleanup sched_clock
59da213 [S390] fix system call parameter functions.
4cd4262 sched: prevent divide by zero error in cpu_avg_load_per_task
4f5a7f4 ftrace: prevent recursion
e899b64 ACPICA: disable _BIF warning
a6e0887 ACPI: delete OSI(Linux) DMI dmesg spam
95a28ed ACPICA: Allow _WAK method to return an Integer
0081b16 ACPI: thinkpad-acpi: fix fan sleep/resume path
3fedd90 sony-laptop: printk tweak
38cfc14 sony-laptop: brightness regression fix
3bdca1b Revert "ACPI: don't enable control method power button as wakeup device when Fixed Power button is used"
65df784 ACPI suspend: Blacklist boxes that require us to set SCI_EN directly on resume
4059907 ACPI: scheduling in atomic via acpi_evaluate_integer ()
723fdb7 ARM: OMAP: Fixes for suspend / resume GPIO wake-up handling
558073d ACPI: battery: Convert discharge energy rate to current properly
90f6713 parisc: struct device - replace bus_id with dev_name(), dev_set_name()
7a3f513 parisc: fix kernel crash when unwinding a userspace process
9860d1b parisc: __kernel_time_t is always long
7b4d469 ACPI: EC: count interrupts only if called from interrupt handler.
a98ee8c [CIFS] fix regression in cifs_write_begin/cifs_write_end
545f4e9 Input: wacom - add support for new USB Tablet PCs
461cba2 drm/i915: Save/restore HWS_PGA on suspend/resume
2fd36a5 [ARM] pxa/corgi: update default config to exclude tosa from being built
72e9622 [ARM] pxa/pcm990: use negative number for an invalid GPIO in camera data
ffd565a x86: fixup config space size of CPU functions for AMD family 11h
147dcf5 ARM: OMAP: Typo fix for clock_allow_idle
031bb27 firewire: fw-sbp2: another iPod mini quirk entry
9e0de91 ieee1394: sbp2: another iPod mini quirk entry
a266d9f [CPUFREQ] powernow-k8: ignore out-of-range PstateStatus value
121fe86 [CPUFREQ] Documentation: Add Blackfin to list of supported processors
de90add x86, bts: fix wrmsr and spinlock over kmalloc
c4858ff x86, pebs: fix PEBS record size configuration
e5e8ca6 x86, bts: turn macro into static inline function
292c669 x86, bts: exclude ds.c from build when disabled
b628353 Merge branch 'topic/fix/hda' into for-linus
eff79ae arch/x86/kernel/pci-calgary_64.c: change simple_strtol to simple_strtoul
5cf02b7 x86: use limited register constraint for setnz
661cd8f ALSA: hda - Check model for Dell 92HD73xx laptops
c65574a ALSA: hda - mark Dell studio 1535 quirk
9502662 ALSA: hda - No 'Headphone as Line-out' swich without line-outs
f73d358 ALSA: hda - Fix AFG power management on IDT 92HD* codecs
9e97697 ALSA: hda - Fix caching of SPDIF status bits
7953031 ARM: OMAP: Remove broken LCD driver for SX1
5244021 drm: move drm vblank initialization/cleanup to driver load/unload
6133047 drm/i915: execbuffer pins objects, no need to ensure they're still in the GTT
05eff84 drm/i915: Always read pipestat in irq_handler
2678d9d drm/i915: Subtract total pinned bytes from available aperture size
28dfe52 drm/i915: Avoid BUG_ONs on VT switch with a wedged chipset.
cdfbc41 drm/i915: Remove IMR masking during interrupt handler, and restart it if needed.
7c46358 drm/i915: Manage PIPESTAT to control vblank interrupts instead of IMR.
8442c87 Input: replace spin_lock_bh with spin_lock_irqsave in ml_ff_playback
8ec2e24 MIPS: Make BUG() __noreturn.
50f3beb V4L/DVB (9742): em28xx-alsa: implement another locking schema
7a8f4cc V4L/DVB (9732): sms1xxx: use new firmware for Hauppauge WinTV MiniStick
e07a1d8 V4L/DVB (9691): gspca: Move the video device to a separate area.
5c4fa00 V4L/DVB (9690): gspca: Lock the subdrivers via module_get/put.
98522a7 V4L/DVB (9689): gspca: Memory leak when disconnect while streaming.
3f9b5d4 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs into merge
be542fa Merge branch 'merge' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
11bac8a Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
fb91ee6 tracing, doc: update mmiotrace documentation
7ee1768 x86, mmiotrace: fix buffer overrun detection
47fd6f7 [ARM] 5335/1: pxa25x_udc: Fix is_vbus_present to return 1 or 0
86bbc2c xen: pin correct PGD on suspend
3d994e1 Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into x86/urgent
fde5be3 HID: remove setup mutex, fix possible deadlock
a1967d6 x86: revert irq number limitation
2ed1cdc irq.h: fix missing/extra kernel-doc
9f14416 Merge commit 'v2.6.28-rc6' into irq/urgent
844c6f6 [ARM] pxa/MioA701: bluetooth resume fix
999f633 [ARM] pxa/MioA701: fix memory corruption.
57550b2 Merge commit 'v2.6.28-rc6' into x86/urgent
b0788ca lockdep: consistent alignement for lockdep info
522a110 function tracing: fix wrong position computing of stack_trace
c879c63 Merge branches 'topic/fix/hda' and 'topic/fix/sound-core' into for-linus
b0fc5e0 ALSA: hda - Add a quirk for Dell Studio 15
3a7abfd ALSA: hda: Add STAC_DELL_M4_3 quirk
a39c4ad sound/sound_core: Fix sparse warnings
6065726 powerpc/spufs: Fix spinning in spufs_ps_fault on signal
818a557 V4L/DVB (9668): em28xx: fix a race condition with hald
cce2571 V4L/DVB (9664): af9015: don't reconnect device in USB-bus
f2a2e49 V4L/DVB (9647): em28xx: void having two concurrent control URB's
c4a9879 V4L/DVB (9646): em28xx: avoid allocating/dealocating memory on every control urb
625ff16 V4L/DVB (9645): em28xx: Avoid memory leaks if registration fails
0253fdc ALSA: hda: STAC_DELL_M6 EAPD
bfe085f x86: fixing __cpuinit/__init tangle, xsave_cntxt_init()
9bc646f x86: fix __cpuinit/__init tangle in init_thread_xstate()
578f3a3 HID: add USB ID for another dual gameron adapter
06d2148 HID: unignore mouse on unibody macbooks
5f4ba04 Input: i8042 - add Compal Hel80 laptop to nomux blacklist
e871809 powerpc/mpc832x_rdb: fix swapped ethernet ids
06597aa powerpc: Use generic PHY driver for Marvell 88E1111 PHY on GE Fanuc SBC610
f464ff5 powerpc/85xx: L2 cache size wrong in 8572DS dts
a4a16be oprofile: fix an overflow in ppro code
99afb98 V4L/DVB (9639): Make dib0700 remote control support work with firmware v1.20
deaf53e V4L/DVB (9635): v4l: s2255drv fix firmware test on big-endian
41286d9 V4L/DVB (9634): Make sure the i2c gate is open before powering down tuner
3f9b46c V4L/DVB (9632): make em28xx aux audio input work
3fa37de V4L/DVB (9631): Make s2api work for ATSC support
c41109f V4L/DVB (9627): em28xx: Avoid i2c register error for boards without eeprom
df4533a V4L/DVB (9608): Fix section mismatch warning for dm1105 during make
4faf100 V4L/DVB (9605): usb-urb: fix memory leak
7935eea V4L/DVB (9604): ttusb_dec: fix memory leak
b7ed785 V4L/DVB (9603): dvb-ttusb-budget: Add validation for ttusb_alloc_iso_urbs
11eb260 V4L/DVB (9602): dvb-ttusb-budget: Add NULL pointer validation
d7c31a1 V4L/DVB (9601): ttusb_dec: Add NULL pointer validation
5181e59 HID: fix blacklist entries for greenasia/pantherlord
c8d6988 powerpc/virtex: Update defconfigs
c7c2ffb powerpc/52xx: update defconfigs
c14464b xsysace: Fix driver to use resource_size_t instead of unsigned long
a108096 powerpc/virtex: fix various format/casting printk mismatches
847cdf4 powerpc/mpc5200: fix bestcomm Kconfig dependencies
6612d9b powerpc/44x: Fix 460EX/460GT machine check handling
5907630 powerpc/40x: Limit allocable DRAM during early mapping
3ff68a6 genirq: __irq_set_trigger: change pr_warning to pr_debug
734f0ba Input: cm109 - add keymap for ATCom AU-100 phone
4f48544 Input: fix the example of an input device driver
5fb17fd Input: psmouse - fix incorrect validate_byte check in OLPC protocol
d6d79a7 Input: atkbd - cancel delayed work before freeing its structure
a8215b8 Input: atkbd - add keymap quirk for Inventec Symphony systems
786b11c Input: i8042 - add Dell XPS M1530 to nomux list
f131e24 irq: fix typo
6c2e940 x86: apic honour irq affinity which was set in early boot
612e368 genirq: fix the affinity setting in setup_irq
f6d87f4 genirq: keep affinities set from userspace across free/request_irq()
2ad4988 UBI: Don't exit from ubi_thread until kthread_should_stop() is true
b77bcb0 UBI: fix EBADMSG handling
9a5415f Input: elo - fix format string in elo driver
from ed313489badef16d700f5a3be50e8fd8f8294bc8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 061e41fdb5047b1fb161e89664057835935ca1d2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Dec 1 19:59:23 2008 -0800
Linux 2.6.28-rc7
commit 0d815142d1988899c97514a25ce5a9f4880e7fc8
Merge: 9c84ba4e502184d95ab75128d3166f595ea2dea0 a693b0cdba94f60f7ed43754d2c34151cdd11da5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Dec 1 19:56:34 2008 -0800
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (25 commits)
em28xx: remove backward compat macro added on a previous fix
V4L/DVB (9748): em28xx: fix compile warning
V4L/DVB (9743): em28xx: fix oops audio
V4L/DVB (9742): em28xx-alsa: implement another locking schema
V4L/DVB (9732): sms1xxx: use new firmware for Hauppauge WinTV MiniStick
V4L/DVB (9691): gspca: Move the video device to a separate area.
V4L/DVB (9690): gspca: Lock the subdrivers via module_get/put.
V4L/DVB (9689): gspca: Memory leak when disconnect while streaming.
V4L/DVB (9668): em28xx: fix a race condition with hald
V4L/DVB (9664): af9015: don't reconnect device in USB-bus
V4L/DVB (9647): em28xx: void having two concurrent control URB's
V4L/DVB (9646): em28xx: avoid allocating/dealocating memory on every control urb
V4L/DVB (9645): em28xx: Avoid memory leaks if registration fails
V4L/DVB (9639): Make dib0700 remote control support work with firmware v1.20
V4L/DVB (9635): v4l: s2255drv fix firmware test on big-endian
V4L/DVB (9634): Make sure the i2c gate is open before powering down tuner
V4L/DVB (9632): make em28xx aux audio input work
V4L/DVB (9631): Make s2api work for ATSC support
V4L/DVB (9627): em28xx: Avoid i2c register error for boards without eeprom
V4L/DVB (9608): Fix section mismatch warning for dm1105 during make
...
commit 9c84ba4e502184d95ab75128d3166f595ea2dea0
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Mon Dec 1 13:14:08 2008 -0800
drivers/gpu/drm/i915/i915_irq.c: fix warning
drivers/gpu/drm/i915/i915_irq.c: In function 'i915_disable_pipestat':
drivers/gpu/drm/i915/i915_irq.c:101: warning: control may reach end of non-void function 'i915_pipestat' being inlined
Cc: Dave Airlie <airlied at linux.ie>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 09a81269c7aadaec3375a7ebd9647acbb72f5a67
Author: Jarkko Lavinen <jlavi at iki.fi>
Date: Mon Dec 1 13:14:08 2008 -0800
i82875p_edac: fix module remove
Fix module removal bugs of i82875p_edac. Also i82975x_edac code seems to
have the same module removal bugs as in i82875p_edac.
The problems were:
1. In module removal i82875p_remove_one() is never called.
Variable i82875p_registered is newer changed from 1, which
guarantees i82875p_remove_one() is not called (and even if it were
called, it would be called in wrong order).
As a result, the edac_mc workque is not stopped and keeps probing.
If kernel debugging options are not enabled, user may not notice
anything going wrong.
if debugging options are enabled and I do "rmmod i82875p_edac", I
get:
edac debug: edac_pci_workq_function() checking
BUG: unable to handle kernel paging request at f882d16f
...
call trace:
[<f8834df3>] ? edac_mc_workq_function+0x55/0x7e [edac_core]
[<c0233974>] ? run_workqueue+0xd7/0x1a5
[<c023392f>] ? run_workqueue+0x92/0x1a5
[<f8834d9e>] ? edac_mc_workq_function+0x0/0x7e [edac_core]
[<c0233af9>] ? worker_thread+0xb7/0xc3
[<c0236a7b>] ? autoremove_wake_function+0x0/0x33
[<c0233a42>] ? worker_thread+0x0/0xc3
[<c0236809>] ? kthread+0x3b/0x61
[<c02367ce>] ? kthread+0x0/0x61
[<c0204587>] ? kernel_thread_helper+0x7/0x10
Fix for this is to get rid of needles variable i82875p_registered
altogether and run i82875p_remove_one() *before*
pci_unregister_driver().
2. edac_mc_del_mc() uses mci after freeing mci
edac_mc_del_mc() calls calls edac_remove_sysfs_mci_device(). The
kobject refcount of mci drops to 0 and mci is freed. After this
mci is accessed via debug print and i82875p_remove_one() still
uses mci->pvt and tries to free mci again with edac_mc_free().
The fix for this is add kobject_get(&mci->edac_mci_kobj) after
edac_mc_alloc(). Then the mci is still available after returning
from edac_mc_del_mc() with refcount 1, and mci->pvt is still
available. When i82875p_remove_one() finally calls edac_mc_free(),
this will cause kobject_put() and mci is released properly.
Signed-off-by: Jarkko Lavinen <jlavi at iki.fi>
Cc: Doug Thompson <norsk5 at yahoo.com>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 307d114441f905e4576871ff28d06408a1af1a7e
Author: Jarkko Lavinen <jlavi at iki.fi>
Date: Mon Dec 1 13:14:06 2008 -0800
i82875p_edac: fix overflow device resource setup
When I do "modprobe i82875p_edac" on my Asus P4C800 MB on kernels 2.6.26
or later, the module load fails due to BAR 0 collision. On 2.6.25 the
module loads just fine.
The overflow device on the MB seems to be hidden and its resources are not
allocated at normal PCI bus init. Log shows the missing resource problem:
EDAC DEBUG: i82875p_probe1()
PCI: 0000:00:06.0 reg 10 32bit mmio: [fecf0000, fecf0fff]
pci 0000:00:06.0: device not available because of BAR 0
[0xfecf0000-0xfecf0fff] collisions
EDAC i82875p: i82875p_setup_overfl_dev(): Failed to enable overflow
device
The patch below fixes this by calling pci_bus_assign_resources() after
the overflow device is revealed and added to the bus. With this patch
I am again able to load and use the module.
Signed-off-by: Jarkko Lavinen <jlavi at iki.fi>
Cc: Doug Thompson <norsk5 at yahoo.com>
Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bca404afdc5206c3bb30168315ee8a98a579ec65
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Mon Dec 1 13:14:05 2008 -0800
fbdev: fix FB console blanking
The commit aef7db4bd5a3b6068dfa05919a3d685199eed116 fixed the problem with
recursive locking in fb blanking code if blank is caused by user setting
the /sys/class/graphics/fb*/blank. However this broke the fbcon timeout
blanking.
If you use a driver that defines ->fb_blank operation and at the same time
that driver relies on other driver (e.g. backlight or lcd class) to blank
the screen, when the fbcon times out and tries to blank the fb, it will
call only fb driver blanker and won't notify the other driver. Thus FB
output is disabled, but the screen isn't blanked.
Restore fbcon blanking and at the same time apply the proper fix for the
above problem: if fbcon_blank is called with FBINFO_FLAG_USEREVENT, we are
already called through notification from fb_blank, thus we don't have to
blank the fb again.
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Cc: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 03801553630c4bec6682108800c9b2de64bdbd37
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Mon Dec 1 13:14:04 2008 -0800
ntfs: don't fool kernel-doc
kernel-doc handles macros now (it has for quite some time), so change the
ntfs_debug() macro's kernel-doc to be just before the macro instead of
before a phony function prototype.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Anton Altaparmakov <aia21 at cantab.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ced69090c573f1db253fb6b84ec537f4f3d7e2f4
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Mon Dec 1 13:14:03 2008 -0800
kernel-doc: handle varargs cleanly
The method for listing varargs in kernel-doc notation is:
* @...: these arguments are printed by the @fmt argument
but scripts/kernel-doc is confused: it always lists varargs as:
... variable arguments
and ignores the @...: line's description, but then prints that
line after the list of function parameters as though it's
not part of the function parameters.
This patch makes kernel-doc print the supplied @... description if it is
present; otherwise a boilerplate "variable arguments" is printed.
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6ff2d39b91aec3dcae951afa982059e3dd9b49dc
Author: Manfred Spraul <manfred at colorfullife.com>
Date: Mon Dec 1 13:14:02 2008 -0800
lib/idr.c: fix rcu related race with idr_find
2nd part of the fixes needed for
http://bugzilla.kernel.org/show_bug.cgi?id=11796.
When the idr tree is either grown or shrunk, then the update to the number
of layers and the top pointer were not atomic. This race caused crashes.
The attached patch fixes that by replicating the layers counter in each
layer, thus idr_find doesn't need idp->layers anymore.
Signed-off-by: Manfred Spraul <manfred at colorfullife.com>
Cc: Clement Calmels <cboulte at gmail.com>
Cc: Nadia Derbey <Nadia.Derbey at bull.net>
Cc: Pierre Peiffer <peifferp at gmail.com>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1d678f365dae28420fa7329a2a35390b3582678d
Author: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Date: Mon Dec 1 13:14:01 2008 -0800
DMA-API.txt: fix description of pci_map_sg/dma_map_sg scatterlists handling
- pci_map_sg/dma_map_sg are used with a scatter gather list that doesn't
come from the block layer (e.g. some network drivers do).
- how IOMMUs merge adjacent elements of the scatter/gather list is
independent of how the block layer determines sees elements.
Signed-off-by: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Cc: Tejun Heo <htejun at gmail.com>
Cc: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4280e3126f641898f0ed1a931645373d3489e2a6
Author: David Howells <dhowells at redhat.com>
Date: Mon Dec 1 13:14:00 2008 -0800
frv: fix mmap2 error handling
Fix the error handling in sys_mmap2(). Currently, if the pgoff check
fails, fput() might have to be called (which it isn't), so do the pgoff
check first, before fget() is called.
Signed-off-by: David Howells <dhowells at redhat.com>
Reported-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a8005992836434cab6182c6147993d21442184c1
Author: Arjan van de Ven <arjan at linux.intel.com>
Date: Mon Dec 1 13:14:00 2008 -0800
taint: add missing comment
The description for 'D' was missing in the comment... (causing me a
minute of WTF followed by looking at more of the code)
Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c4c6fa9891f3d1bcaae4f39fb751d5302965b566
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon Dec 1 13:13:58 2008 -0800
radeonfb: fix problem with color expansion & alignment
The engine on some radeon variants locks up if color expansion is called
for non aligned source data. This patch enables a feature of the core
fbdev to request aligned input pixmaps and uses the HW clipping engine to
clip the output to the requested size
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=11875
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Tested-by: James Cloos <cloos at jhcloos.com>
Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
Cc: "David S. Miller" <davem at davemloft.net>
Cc: Krzysztof Helt <krzysztof.h1 at poczta.fm>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b93c35ff39d19f20c47c06c206986afefecc777a
Author: Ben Dooks <ben-linux at fluff.org>
Date: Mon Dec 1 13:13:57 2008 -0800
spi: fix spi_s3c24xx_gpio num_chipselect
The spi master driver must have num_chipselect set to allow the bus to
initialise. Pass this through the platform data.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e39ea8a2def1fcb203ed0183317124348962e351
Author: Ben Dooks <ben-linux at fluff.org>
Date: Mon Dec 1 13:13:56 2008 -0800
spi: fix spi_s3c24xx_gpio device handle lookup
The spidev_to_sg() call in spi_s3c24xx_gpio.c was using the wrong method
to convert the spi device into the private data for the driver. Fix this
by using spi_master_get_devdata.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4e253d23003b54c88d0919d6088be74f00eec3c7
Author: Jan Nikitenko <jan.nikitenko at gmail.com>
Date: Mon Dec 1 13:13:56 2008 -0800
spi: au1550_spi full duplex dma fix
Fix unsafe order in dma mapping operation: always flush data from the
cache *BEFORE* invalidating it, to allow full duplex transfers where the
same buffer may be used for both writes and reads. Tested with mmc-spi.
Signed-off-by: Jan Nikitenko <jan.nikitenko at gmail.com>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6a010b56e9bd2fdb32efd153e1a08305949b6b53
Author: Julien Boibessot <julien.boibessot at free.fr>
Date: Mon Dec 1 13:13:55 2008 -0800
spi: fix spi_imx probe oopsing
Corrects spi_imx driver oops during initialization/probing: can't use
drv_data before it's allocated.
Signed-off-by: Julien Boibessot <julien.boibessot at armadeus.com>
Acked-by: Sascha Hauer <s.hauer at pengutronix.de>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7ef9964e6d1b911b78709f144000aacadd0ebc21
Author: Davide Libenzi <davidel at xmailserver.org>
Date: Mon Dec 1 13:13:55 2008 -0800
epoll: introduce resource usage limits
It has been thought that the per-user file descriptors limit would also
limit the resources that a normal user can request via the epoll
interface. Vegard Nossum reported a very simple program (a modified
version attached) that can make a normal user to request a pretty large
amount of kernel memory, well within the its maximum number of fds. To
solve such problem, default limits are now imposed, and /proc based
configuration has been introduced. A new directory has been created,
named /proc/sys/fs/epoll/ and inside there, there are two configuration
points:
max_user_instances = Maximum number of devices - per user
max_user_watches = Maximum number of "watched" fds - per user
The current default for "max_user_watches" limits the memory used by epoll
to store "watches", to 1/32 of the amount of the low RAM. As example, a
256MB 32bit machine, will have "max_user_watches" set to roughly 90000.
That should be enough to not break existing heavy epoll users. The
default value for "max_user_instances" is set to 128, that should be
enough too.
This also changes the userspace, because a new error code can now come out
from EPOLL_CTL_ADD (-ENOSPC). The EMFILE from epoll_create() was already
listed, so that should be ok.
[akpm at linux-foundation.org: use get_current_user()]
Signed-off-by: Davide Libenzi <davidel at xmailserver.org>
Cc: Michael Kerrisk <mtk.manpages at gmail.com>
Cc: <stable at kernel.org>
Cc: Cyrill Gorcunov <gorcunov at gmail.com>
Reported-by: Vegard Nossum <vegardno at ifi.uio.no>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b7d271df873c5121a4ca1c70dea126b5920ec2f1
Author: Stefano Babic <sbabic at denx.de>
Date: Mon Dec 1 13:13:53 2008 -0800
spi: mpc52xx_psc_spi chipselect bugfix
According to the manual the "tdfOnExit" flag must be set on the last byte
we want to send. The PSC controller holds SS low until the flag is set.
However, the flag was set always on the last byte of the FIFO,
independently if it is the last byte of the transfer. This generates
spurious toggling of the SS signals that breaks the protocol of some
peripherals. Fix.
Signed-off-by: Stefano Babic <sbabic at denx.de>
Acked-by: Grant Likely <grant.likely at secretlab.ca>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit aaacf4bb51b243875b203e6ff73b5047636b4efa
Author: Wolfgang Ocker <weo at reccoware.de>
Date: Mon Dec 1 13:13:52 2008 -0800
spi: avoid spidev crash when device is removed
I saw a kernel oops in spidev_remove() when a spidev device was registered
and I unloaded the SPI master driver:
Unable to handle kernel paging request for data at address 0x00000004
Faulting instruction address: 0xc01c0c50
Oops: Kernel access of bad area, sig: 11 [#1]
CDSPR
Modules linked in: spi_ppc4xx(-)
NIP: c01c0c50 LR: c01bf9e4 CTR: c01c0c34
REGS: cec89c30 TRAP: 0300 Not tainted (2.6.27.3izt)
MSR: 00021000 <ME> CR: 24000228 XER: 20000007
DEAR: 00000004, ESR: 00800000
TASK = cf889040[2070] 'rmmod' THREAD: cec88000
GPR00: 00000000 cec89ce0 cf889040 cec8e000 00000004 cec8e000 ffffffff 00000000
GPR08: 0000001c c0336380 00000000 c01c0c34 00000001 1001a338 100e0000 100df49c
GPR16: 100b54c0 100df49c 100ddd20 100f05a8 100b5340 100efd68 00000000 00000000
GPR24: 100ec008 100f0428 c0327788 c0327794 cec8e0ac cec8e000 c0336380 00000000
NIP [c01c0c50] spidev_remove+0x1c/0xe4
LR [c01bf9e4] spi_drv_remove+0x2c/0x3c
Call Trace:
[cec89d00] [c01bf9e4] spi_drv_remove+0x2c/0x3c
[cec89d10] [c01859a0] __device_release_driver+0x78/0xb4
[cec89d20] [c0185ab0] device_release_driver+0x28/0x44
[cec89d40] [c0184be8] bus_remove_device+0xac/0xd8
[cec89d60] [c0183094] device_del+0x100/0x194
[cec89d80] [c0183140] device_unregister+0x18/0x30
[cec89da0] [c01bf30c] __unregister+0x20/0x34
[cec89db0] [c0182778] device_for_each_child+0x38/0x74
[cec89de0] [c01bf2d0] spi_unregister_master+0x28/0x44
[cec89e00] [c01bfeac] spi_bitbang_stop+0x1c/0x58
[cec89e20] [d908a5e0] spi_ppc4xx_of_remove+0x24/0x7c [spi_ppc4xx]
[...]
IMHO a call to spi_set_drvdata() is missing in spidev_probe(). The patch
below helped.
Signed-off-by: Wolfgang Ocker <weo at reccoware.de>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dc8c214a9c37eb288b1c4782632649e55d251c68
Author: roel kluin <roel.kluin at gmail.com>
Date: Mon Dec 1 13:13:51 2008 -0800
spi documentation: use __initdata on struct
Use __initdata for data, not __init.
Signed-off-by: Roel Kluin <roel.kluin at gmail.com>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dc924efb52ba9e4dffec5b15ae2242b894198139
Author: Henrik Rydberg <rydberg at bitmath.org>
Date: Mon Dec 1 13:13:49 2008 -0800
hwmon: applesmc: make applesmc load automatically on startup
make use of the new dmi device loading support to automatically load the
applesmc driver based on the dmi_match table.
Signed-off-by: Henrik Rydberg <rydberg at euromail.se>
Cc: Nicolas Boichat <nicolas at boichat.ch>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 36be47d6d8d98f54b6c4f891e9f54fb2bf554584
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Dec 1 13:13:49 2008 -0800
parport_serial: fix array overflow
The netmos_9xx5_combo type assumes that PCI SSID provides always the
correct value for the number of parallel and serial ports, but there are
indeed broken devices with wrong numbers, which may result in Oops.
This patch simply adds the check of the array range.
Reference: Novell bnc#447067
https://bugzilla.novell.com/show_bug.cgi?id=447067
Signed-off-by: Takashi Iwai <tiwai at suse.de>
Cc: <stable at kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dc19f9db38295f811d9041bd89b113beccbd763a
Author: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
Date: Mon Dec 1 13:13:48 2008 -0800
memcg: memory hotplug fix for notifier callback
Fixes for memcg/memory hotplug.
While memory hotplug allocate/free memmap, page_cgroup doesn't free
page_cgroup at OFFLINE when page_cgroup is allocated via bootomem.
(Because freeing bootmem requires special care.)
Then, if page_cgroup is allocated by bootmem and memmap is freed/allocated
by memory hotplug, page_cgroup->page == page is no longer true.
But current MEM_ONLINE handler doesn't check it and update
page_cgroup->page if it's not necessary to allocate page_cgroup. (This
was not found because memmap is not freed if SPARSEMEM_VMEMMAP is y.)
And I noticed that MEM_ONLINE can be called against "part of section".
So, freeing page_cgroup at CANCEL_ONLINE will cause trouble. (freeing
used page_cgroup) Don't rollback at CANCEL.
One more, current memory hotplug notifier is stopped by slub because it
sets NOTIFY_STOP_MASK to return vaule. So, page_cgroup's callback never
be called. (low priority than slub now.)
I think this slub's behavior is not intentional(BUG). and fixes it.
Another way to be considered about page_cgroup allocation:
- free page_cgroup at OFFLINE even if it's from bootmem
and remove specieal handler. But it requires more changes.
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=12041
Signed-off-by: KAMEZAWA Hiruyoki <kamezawa.hiroyu at jp.fujitsu.com>
Cc: Li Zefan <lizf at cn.fujitsu.com>
Cc: Balbir Singh <balbir at in.ibm.com>
Cc: Pavel Emelyanov <xemul at openvz.org>
Tested-by: Badari Pulavarty <pbadari at us.ibm.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b29acbdcf877009af3f1fc0750bcac314c51e055
Author: Nick Piggin <npiggin at suse.de>
Date: Mon Dec 1 13:13:47 2008 -0800
mm: vmalloc fix lazy unmapping cache aliasing
Jim Radford has reported that the vmap subsystem rewrite was sometimes
causing his VIVT ARM system to behave strangely (seemed like going into
infinite loops trying to fault in pages to userspace).
We determined that the problem was most likely due to a cache aliasing
issue. flush_cache_vunmap was only being called at the moment the page
tables were to be taken down, however with lazy unmapping, this can happen
after the page has subsequently been freed and allocated for something
else. The dangling alias may still have dirty data attached to it.
The fix for this problem is to do the cache flushing when the caller has
called vunmap -- it would be a bug for them to write anything else to the
mapping at that point.
That appeared to solve Jim's problems.
Reported-by: Jim Radford <radford at blackbean.org>
Signed-off-by: Nick Piggin <npiggin at suse.de>
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8650e51ac94b5fe93c02e3c8fef02e416f14501c
Merge: 7ac01108e71ca8ccc2ded4ee98035d0e5db9c981 d6b58f89f7257c8099c2260e2bea042a917d6cdf
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Dec 1 18:56:55 2008 -0800
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: fix regression in ocfs2_read_blocks_sync()
ocfs2: fix return value set in init_dlmfs_fs()
ocfs2: Small documentation update
ocfs2: fix wake_up in unlock_ast
ocfs2: initialize stack_user lvbptr
ocfs2: comments typo fix
commit d6b58f89f7257c8099c2260e2bea042a917d6cdf
Author: Mark Fasheh <mfasheh at suse.com>
Date: Fri Nov 21 14:06:55 2008 -0800
ocfs2: fix regression in ocfs2_read_blocks_sync()
We're panicing in ocfs2_read_blocks_sync() if a jbd-managed buffer is seen.
At first glance, this seems ok but in reality it can happen. My test case
was to just run 'exorcist'. A struct inode is being pushed out of memory but
is then re-read at a later time, before the buffer has been checkpointed by
jbd. This causes a BUG to be hit in ocfs2_read_blocks_sync().
Reviewed-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 07d9a3954a68764aefe16855bcd0f86deeb5c825
Author: Coly Li <coyli at suse.de>
Date: Mon Nov 17 12:38:22 2008 +0800
ocfs2: fix return value set in init_dlmfs_fs()
In init_dlmfs_fs(), if calling kmem_cache_create() failed, the code will use return value from
calling bdi_init(). The correct behavior should be set status as -ENOMEM before going to "bail:".
Signed-off-by: Coly Li <coyli at suse.de>
Acked-by: Sunil Mushran <sunil.mushran at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit a2eee69b814854095ed835a6eb64b8efc220cd6a
Author: Mark Fasheh <mfasheh at suse.com>
Date: Tue Nov 18 15:08:42 2008 -0800
ocfs2: Small documentation update
Remove some features from the "not-supported" list that are actually
supported now.
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 07f9eebcdfaeefc8f807fa1bcce1d7c3ae6661b1
Author: David Teigland <teigland at redhat.com>
Date: Mon Nov 17 12:28:48 2008 -0600
ocfs2: fix wake_up in unlock_ast
In ocfs2_unlock_ast(), call wake_up() on lockres before releasing
the spin lock on it. As soon as the spin lock is released, the
lockres can be freed.
Signed-off-by: David Teigland <teigland at redhat.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 66f502a416f18cd36179290746aa53736c6b2828
Author: David Teigland <teigland at redhat.com>
Date: Mon Nov 10 16:24:57 2008 -0600
ocfs2: initialize stack_user lvbptr
The locking_state dump, ocfs2_dlm_seq_show, reads the lvb on locks where it
has not yet been initialized by a lock call.
Signed-off-by: David Teigland <teigland at redhat.com>
Acked-by: Joel Becker <joel.becker at oracle.com>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit 3b5da0189c93160e44b878d2c72e9552d642497c
Author: Coly Li <coyli at suse.de>
Date: Wed Nov 5 15:16:24 2008 +0800
ocfs2: comments typo fix
This patch fixes two typos in comments of ocfs2.
Signed-off-by: Coly Li <coyli at suse.de>
Signed-off-by: Mark Fasheh <mfasheh at suse.com>
commit a693b0cdba94f60f7ed43754d2c34151cdd11da5
Author: Mauro Carvalho Chehab <mchehab at redhat.com>
Date: Mon Dec 1 18:04:14 2008 -0200
em28xx: remove backward compat macro added on a previous fix
commit 50f3beb50abe0cc0228363af804e50e710b3e5b0 fixed em28xx-alsa
locking schema. However, a backport macro was kept.
This patch removes the macro, since it is not needed for the module
compilation against upstream.
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit 7ac01108e71ca8ccc2ded4ee98035d0e5db9c981
Merge: 4bc2a9bf8cbb63f3bb9797b2bf30b2316bd27a2b ac70a964b0e22a95af3628c344815857a01461b7
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Dec 1 11:23:33 2008 -0800
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: blacklist Seagate drives which time out FLUSH_CACHE when used with NCQ
[libata] pata_rb532_cf: fix signature of the xfer function
[libata] pata_rb532_cf: fix and rename register definitions
ata_piix: add borked Tecra M4 to broken suspend list
commit 484ab62c5ee805c2bdc405a85a4e64da2722690f
Author: Hans Verkuil <hverkuil at xs4all.nl>
Date: Mon Nov 24 09:53:22 2008 -0300
V4L/DVB (9748): em28xx: fix compile warning
Label fail_unreg is no longer used.
Signed-off-by: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit faa3bd2e48e594e9475e92fb84bb6ebe6f62f23b
Author: Douglas Schilling Landgraf <dougsland at linuxtv.org>
Date: Mon Nov 24 09:51:20 2008 -0300
V4L/DVB (9743): em28xx: fix oops audio
Replaced usb_kill_usb for usb_unlink_usb
(wait until urb to fully stop require USB core to put the calling process to sleep).
Oops:
http://www.kerneloops.org/raw.php?rawid=71799&msgid=
Signed-off-by: Douglas Schilling Landgraf <dougsland at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit 4bc2a9bf8cbb63f3bb9797b2bf30b2316bd27a2b
Merge: 6a1214113090905aca6a492fc8ef10d84c608a69 b0f43dcca8a1f46e17b26d10f3cb1b297ebfb44e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Dec 1 11:01:54 2008 -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:
IB/mlx4: Fix MTT leakage in resize CQ
IB/ehca: Fix problem with generated flush work completions
IB/ehca: Change misleading error message on memory hotplug
mlx4_core: Save/restore default port IB capability mask
commit ac70a964b0e22a95af3628c344815857a01461b7
Author: Tejun Heo <tj at kernel.org>
Date: Thu Nov 27 13:36:48 2008 +0900
libata: blacklist Seagate drives which time out FLUSH_CACHE when used with NCQ
Some recent Seagate harddrives have firmware bug which causes FLUSH
CACHE to timeout under certain circumstances if NCQ is being used.
This can be worked around by disabling NCQ and fixed by updating the
firmware. Implement ATA_HORKAGE_FIRMWARE_UPDATE and blacklist these
devices.
The wiki page has been updated to contain information on this issue.
http://ata.wiki.kernel.org/index.php/Known_issues
Signed-off-by: Tejun Heo <tj at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 03f60840fa462e92220b093f778b2426ceab23af
Author: Phil Sutter <n0-1 at freewrt.org>
Date: Fri Nov 28 20:48:35 2008 +0100
[libata] pata_rb532_cf: fix signature of the xfer function
Per definition, this function should return the number of bytes
consumed. As the original parameter "buflen" is being decremented inside
the read/write loop, save it in "retlen" at the beginning.
Signed-off-by: Phil Sutter <n0-1 at freewrt.org>
Acked-by: Sergei Shtyltov <sshtylyov at ru.mvista.com>
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Acked-by: Florian Fainelli <florian at openwrt.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 9f14786e27908a176f0568cf2132558efef71b31
Author: Phil Sutter <n0-1 at freewrt.org>
Date: Fri Nov 28 20:48:26 2008 +0100
[libata] pata_rb532_cf: fix and rename register definitions
The original standalone driver uses a custom address for the error
register. Use it in pata_rb532_cf, too.
Rename two register definitions:
- The address offset 0x0800 in fact is the ATA base, not ATA command
address.
- The offset 0x0C00 is not a regular ATA data address, but a buffered one
allowing 4-byte IO.
Signed-off-by: Phil Sutter <n0-1 at freewrt.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 1eedb4a90c958d8d59e0e4f19c297b445df21cf9
Author: Tejun Heo <tj at kernel.org>
Date: Sat Nov 29 22:37:21 2008 +0900
ata_piix: add borked Tecra M4 to broken suspend list
Tecra M4 sometimes forget what it is and reports bogus data via DMI
which makes the machine evade broken suspend matching and thus fail
suspend/resume. This patch updates piix_broken_suspend() such that it
can match such case. As the borked DMI data is a bit generic,
matching many entries to make the match more specific is necessary.
As the usual DMI matching is limited to four entries, this patch uses
hard coded manual matching.
This is reported by Alexandru Romanescu.
Signed-off-by: Tejun Heo <tj at kernel.org>
Cc: Alexandru Romanescu <a_romanescu at yahoo.co.uk>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit b0f43dcca8a1f46e17b26d10f3cb1b297ebfb44e
Merge: 7ec4f4634a4326c1f8fd172c80c8f59c9b3e90a4 42ab01c31526ac1d06d193f81a498bf3cf2acfe4
Author: Roland Dreier <rolandd at cisco.com>
Date: Mon Dec 1 10:11:50 2008 -0800
Merge branches 'ehca' and 'mlx4' into for-linus
commit 42ab01c31526ac1d06d193f81a498bf3cf2acfe4
Author: Jack Morgenstein <jackm at dev.mellanox.co.il>
Date: Mon Dec 1 10:09:37 2008 -0800
IB/mlx4: Fix MTT leakage in resize CQ
When resizing a CQ, MTTs associated with the old CQE buffer were not
freed. As a result, if any app used resize CQ repeatedly, all MTTs
were eventually exhausted, which led to all memory registration
operations failing until the driver is reloaded.
Once the RESIZE_CQ command returns successfully from FW, FW no longer
accesses the old CQ buffer, so it is safe to deallocate the MTT
entries used by the old CQ buffer.
Finally, if the RESIZE_CQ command fails, the MTTs allocated for the
new CQEs buffer also need to be de-allocated.
This fixes <https://bugs.openfabrics.org/show_bug.cgi?id=1416>.
Signed-off-by: Jack Morgenstein <jackm at dev.mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 7ec4f4634a4326c1f8fd172c80c8f59c9b3e90a4
Author: Stefan Roscher <ossrosch at linux.vnet.ibm.com>
Date: Mon Dec 1 10:05:50 2008 -0800
IB/ehca: Fix problem with generated flush work completions
This fix enables ehca device driver to generate flush work completions
even if the application doesn't request completions for all work
requests. The current implementation of ehca will generate flush work
completions for the wrong work requests if an application uses non
signaled work completions.
Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 6b1f9d647e848060d34c3db408413989f1e460ba
Author: Joachim Fenkes <fenkes at de.ibm.com>
Date: Mon Dec 1 10:05:44 2008 -0800
IB/ehca: Change misleading error message on memory hotplug
The error message printed when the eHCA driver prevents memory hotplug
is misleading -- the user might think that hot-removing the lhca,
hotplugging memory, then hot-adding the lhca again will work, but it
actually doesn't.
Signed-off-by: Joachim Fenkes <fenkes at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 6a1214113090905aca6a492fc8ef10d84c608a69
Merge: c07f62e5f18123103459ff74e86af1518a5b8af5 2642b11295ebcc94843045933061bfbb263fce7f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Dec 1 09:34:23 2008 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: sbp2: fix race condition in state change
ieee1394: fix list corruption (reported at module removal)
firewire: fw-sbp2: another iPod mini quirk entry
ieee1394: sbp2: another iPod mini quirk entry
commit c07f62e5f18123103459ff74e86af1518a5b8af5
Merge: e5404586a499f7dce915456e85ff94b2df7a3b1c ee8a1a0a1a5817accd03ced7e7ffde3a4430f485
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Dec 1 08:33:59 2008 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: Apple ALU wireless keyboards are bluetooth devices
HID: remove setup mutex, fix possible deadlock
HID: add USB ID for another dual gameron adapter
HID: unignore mouse on unibody macbooks
HID: fix blacklist entries for greenasia/pantherlord
commit e5404586a499f7dce915456e85ff94b2df7a3b1c
Author: Kevin Hao <kexin.hao at windriver.com>
Date: Mon Dec 1 11:36:16 2008 +0000
Add kref to fake tty used by USB console
We alloc a fake tty in usb serial console setup function. we should
init the tty's kref otherwise we will face WARN_ON after following
invoke of tty_port_tty_set --> tty_kref_get.
Signed-off-by: Kevin Hao <kexin.hao at windriver.com>
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 296fa7f6a3f3342d40df7713e74246198295654b
Author: Will Newton <will.newton at gmail.com>
Date: Mon Dec 1 11:36:06 2008 +0000
drivers/char/tty_io.c: Avoid panic when no console is configured.
When no console is configured tty_open tries to call kref_get on a NULL
pointer, return ENODEV instead.
Signed-off-by: Will Newton <will.newton at gmail.com>
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b4dcfbee3b536c9125762e8f6681ac6be0e9256b
Merge: ecf318cc3daee6f41354cc781e2d4b766f7eec3e 5bb4bd9895df508ed2bd8b3280252d8a8170e4ac
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Dec 1 07:58:49 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: serial: add more Onda device ids to option driver
USB: usb-storage: unusual_devs entry for Nikon D2H
USB: storage: unusual_devs entry for Mio C520-GPS
USB: fsl_usb2_udc: Report disconnect before unbinding
USB: fsl_qe_udc: Report disconnect before unbinding
USB: fix SB600 USB subsystem hang bug
Revert "USB: improve ehci_watchdog's side effect in CPU power management"
commit ecf318cc3daee6f41354cc781e2d4b766f7eec3e
Merge: 2a1dc509747fdcfdf3a2df818a14908aed86c3d4 a1e0eb104249817e5251bd4aade50921ffcb2159
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Dec 1 07:58:23 2008 -0800
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: Fix build for 32-bit SMP configs
commit 2a1dc509747fdcfdf3a2df818a14908aed86c3d4
Author: Johannes Weiner <hannes at saeurebad.de>
Date: Mon Dec 1 03:00:35 2008 +0100
vmscan: protect zone rotation stats by lru lock
The zone's rotation statistics must not be accessed without the
corresponding LRU lock held. Fix an unprotected write in
shrink_active_list().
Acked-by: Rik van Riel <riel at redhat.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Signed-off-by: Johannes Weiner <hannes at saeurebad.de>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 33b07db9f38fe73b3895f8d4db8fdee03e3afec3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Dec 1 07:55:14 2008 -0800
Revert "of_platform_driver noise on sparce"
This reverts commit e669dae6141ff97d3c7566207f5de3b487dcf837, since it
is incomplete, and clashes with fuller patches and the sparc 32/64
unification effort.
Requested-by: David Miller <davem at davemloft.net>
Acked-by: Al Viro <viro at ZenIV.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5bb4bd9895df508ed2bd8b3280252d8a8170e4ac
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Sat Nov 29 11:46:21 2008 -0800
USB: serial: add more Onda device ids to option driver
Thanks to Domenico Riccio for pointing these out.
Cc: Domenico Riccio <domenico.riccio at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 621b239d75b790ac66854d46b094874f69e6776e
Author: Tobias Kunze Briseño <t at fictive.com>
Date: Mon Nov 24 11:28:31 2008 -0500
USB: usb-storage: unusual_devs entry for Nikon D2H
This patch adds an unusual_devs entry for the Nikon D2H camera.
From: Tobias Kunze Briseño <t at fictive.com>,
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit a6b7b034d7f20761c55743be2acb762ce09a0c6b
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Fri Nov 21 16:15:12 2008 -0500
USB: storage: unusual_devs entry for Mio C520-GPS
This patch (as1176) adds an unusual_devs entry for the Mio C520 GPS
unit. Other devices also based on the Mitac hardware use the same USB
interface firmware, so the Vendor and Product names are generalized.
This fixes Bugzilla #11583.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Tested-by: Tamas Kerecsen <kerecsen at bigfoot.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 1f15a506f356aa21c29b6a7b0e9e826695273dfc
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Thu Nov 13 15:00:46 2008 +0300
USB: fsl_usb2_udc: Report disconnect before unbinding
Gadgets disable endpoints in their disconnect callbacks, so
we must call disconnect before unbinding.
The patch fixes following badness:
root at b1:~# insmod fsl_usb2_udc.ko
Freescale High-Speed USB SOC Device Controller driver (Apr 20, 2007)
root at b1:~# insmod g_ether.ko
g_ether gadget: using random self ethernet address
g_ether gadget: using random host ethernet address
usb0: MAC 26:07:ba:c0:44:33
usb0: HOST MAC 96:81:0c:05:4d:e3
g_ether gadget: Ethernet Gadget, version: Memorial Day 2008
g_ether gadget: g_ether ready
fsl-usb2-udc: bind to driver g_ether
g_ether gadget: high speed config #1: CDC Ethernet (ECM)
root at b1:~# rmmod g_ether.ko
------------[ cut here ]------------
Badness at drivers/usb/gadget/composite.c:871
[...]
NIP [e10c3454] composite_unbind+0x24/0x15c [g_ether]
LR [e10aa454] usb_gadget_unregister_driver+0x13c/0x164 [fsl_usb2_udc]
Call Trace:
[df145e80] [ffffff94] 0xffffff94 (unreliable)
[df145eb0] [e10aa454] usb_gadget_unregister_driver+0x13c/0x164 [fsl_usb2_udc]
[df145ed0] [e10c4c40] usb_composite_unregister+0x3c/0x4c [g_ether]
[df145ee0] [c006bcc0] sys_delete_module+0x130/0x19c
[df145f40] [c00142d8] ret_from_syscall+0x0/0x38
[...]
unregistered gadget driver 'g_ether'
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 9ac36da3f8bc646a628bd09326e090defc8b7940
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Thu Nov 13 14:57:20 2008 +0300
USB: fsl_qe_udc: Report disconnect before unbinding
Gadgets disable endpoints in their disconnect callbacks, so
we must call disconnect before unbinding. This also fixes
muram memory leak, since we free muram in the qe_ep_disable().
But mainly the patch fixes following badness:
root at b1:~# insmod fsl_qe_udc.ko
fsl_qe_udc: Freescale QE/CPM USB Device Controller driver, 1.0
fsl_qe_udc e01006c0.usb: QE USB controller initialized as device
root at b1:~# insmod g_ether.ko
g_ether gadget: using random self ethernet address
g_ether gadget: using random host ethernet address
usb0: MAC be:2d:3c:fa:be:f0
usb0: HOST MAC 62:b8:6a:df:38:66
g_ether gadget: Ethernet Gadget, version: Memorial Day 2008
g_ether gadget: g_ether ready
fsl_qe_udc e01006c0.usb: fsl_qe_udc bind to driver g_ether
g_ether gadget: high speed config #1: CDC Ethernet (ECM)
root at b1:~# rmmod g_ether.ko
------------[ cut here ]------------
Badness at drivers/usb/gadget/composite.c:871
[...]
NIP [d10c1374] composite_unbind+0x24/0x15c [g_ether]
LR [d10a82f4] usb_gadget_unregister_driver+0x128/0x168 [fsl_qe_udc]
Call Trace:
[cfb93e80] [cfb1f3a0] 0xcfb1f3a0 (unreliable)
[cfb93eb0] [d10a82f4] usb_gadget_unregister_driver+0x128/0x168 [fsl_qe_udc]
[cfb93ed0] [d10c2a3c] usb_composite_unregister+0x3c/0x4c [g_ether]
[cfb93ee0] [c006bde0] sys_delete_module+0x130/0x19c
[cfb93f40] [c00142d8] ret_from_syscall+0x0/0x38
[...]
fsl_qe_udc e01006c0.usb: unregistered gadget driver 'g_ether'
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 0a99e8ac430a27825bd055719765fd0d65cd797f
Author: Shane Huang <shane.huang at amd.com>
Date: Tue Nov 25 15:12:33 2008 +0800
USB: fix SB600 USB subsystem hang bug
This patch is required for all AMD SB600 revisions to avoid USB subsystem hang
symptom. The USB subsystem hang symptom is observed when the system has
multiple USB devices connected to it. In some cases a USB hub may be required
to observe this symptom.
Reported in bugzilla as #11599, the similar patch for SB700 old revision is:
commit b09bc6cbae4dd3a2d35722668ef2c502a7b8b093
Reported-by: raffaele <ralfconn at tele2.it>
Tested-by: Roman Mamedov <roman at rm.pp.ru>
Signed-off-by: Shane Huang <shane.huang at amd.com>
Cc: stable <stable at kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit 269f0532332410e97e3edeb78e6cd3bb940e52b4
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date: Tue Nov 25 13:34:45 2008 -0800
Revert "USB: improve ehci_watchdog's side effect in CPU power management"
This reverts commit f0d781d59cb621e1795d510039df973d0f8b23fc.
It was the wrong thing to do, and does not really do what it said
it did.
Cc: Yi Yang <yi.y.yang at intel.com>
Cc: David Brownell <dbrownell at users.sourceforge.net>
Cc: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
commit a1e0eb104249817e5251bd4aade50921ffcb2159
Author: Milton Miller <miltonm at bga.com>
Date: Sun Nov 16 11:44:42 2008 +0000
powerpc: Fix build for 32-bit SMP configs
attr_smt_snooze_delay is only defined for CONFIG_PPC64, so protect the
attribute removal with the same condition. This fixes this build error
on 32-bit SMP configurations:
/data/home/miltonm/next.git/arch/powerpc/kernel/sysfs.c: In function ‘unregister_cpu_online’:
/data/home/miltonm/next.git/arch/powerpc/kernel/sysfs.c:722: error: ‘attr_smt_snooze_delay’ undeclared (first use in this function)
/data/home/miltonm/next.git/arch/powerpc/kernel/sysfs.c:722: error: (Each undeclared identifier is reported only once
/data/home/miltonm/next.git/arch/powerpc/kernel/sysfs.c:722: error: for each function it appears in.)
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit d9d060a98ff89fe0f86e24c9c0c3d2f0c566781c
Merge: 03cfdb86ac66677dbe76accae3f22c374a15b814 151903d5466fbcfb56ce792c3d5ea0ecbae15d07
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 16:45:13 2008 -0800
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/i915: Fix copy'n'pasteo that broke VT switch if flushing was non-empty.
commit 03cfdb86ac66677dbe76accae3f22c374a15b814
Merge: 4ec8f077e4dd51f713984669781e7b568b8c41e2 ab598b6680f1e74c267d1547ee352f3e1e530f89
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 16:44:18 2008 -0800
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: Fix system calls on Cell entered with XER.SO=1
powerpc/cell: Fix GDB watchpoints, again
powerpc/mpic: Don't reset affinity for secondary MPIC on boot
powerpc/cell/axon-msi: Retry on missing interrupt
powerpc: Fix boot freeze on machine with empty memory node
powerpc: Fix IRQ assignment for some PCIe devices
powerpc/spufs: Fix spinning in spufs_ps_fault on signal
powerpc/mpc832x_rdb: fix swapped ethernet ids
powerpc: Use generic PHY driver for Marvell 88E1111 PHY on GE Fanuc SBC610
powerpc/85xx: L2 cache size wrong in 8572DS dts
powerpc/virtex: Update defconfigs
powerpc/52xx: update defconfigs
xsysace: Fix driver to use resource_size_t instead of unsigned long
powerpc/virtex: fix various format/casting printk mismatches
powerpc/mpc5200: fix bestcomm Kconfig dependencies
powerpc/44x: Fix 460EX/460GT machine check handling
powerpc/40x: Limit allocable DRAM during early mapping
commit 4ec8f077e4dd51f713984669781e7b568b8c41e2
Merge: a6e470fd1bbfea8e51d2b10b0713e802b782f19a af38d90d6a5e135b546a3f86222ba2ad895ba4ae
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 16:39:06 2008 -0800
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
Allow architectures to override copy_user_highpage()
[ARM] pxa/palmtx: misc fixes to use generic GPIO API
ARM: OMAP: Fixes for suspend / resume GPIO wake-up handling
[ARM] pxa/corgi: update default config to exclude tosa from being built
[ARM] pxa/pcm990: use negative number for an invalid GPIO in camera data
ARM: OMAP: Typo fix for clock_allow_idle
ARM: OMAP: Remove broken LCD driver for SX1
[ARM] 5335/1: pxa25x_udc: Fix is_vbus_present to return 1 or 0
[ARM] pxa/MioA701: bluetooth resume fix
[ARM] pxa/MioA701: fix memory corruption.
commit 151903d5466fbcfb56ce792c3d5ea0ecbae15d07
Author: Eric Anholt <eric at anholt.net>
Date: Mon Dec 1 10:23:21 2008 +1000
drm/i915: Fix copy'n'pasteo that broke VT switch if flushing was non-empty.
Introduced in the "Avoid BUG_ONs on VT switch" commit.
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit ab598b6680f1e74c267d1547ee352f3e1e530f89
Author: Paul Mackerras <paulus at samba.org>
Date: Sun Nov 30 11:49:45 2008 +0000
powerpc: Fix system calls on Cell entered with XER.SO=1
It turns out that on Cell, on a kernel with CONFIG_VIRT_CPU_ACCOUNTING
= y, if a program sets the SO (summary overflow) bit in the XER and
then does a system call, the SO bit in CR0 will be set on return
regardless of whether the system call detected an error. Since CR0.SO
is used as the error indication from the system call, this means that
all system calls appear to fail.
The reason is that the workaround for the timebase bug on Cell uses a
compare instruction. With CONFIG_VIRT_CPU_ACCOUNTING = y, the
ACCOUNT_CPU_USER_ENTRY macro reads the timebase, so we end up doing a
compare instruction, which copies XER.SO to CR0.SO. Since we were
doing this in the system call entry patch after clearing CR0.SO but
before saving the CR, this meant that the saved CR image had CR0.SO
set if XER.SO was set on entry.
This fixes it by moving the clearing of CR0.SO to after the
ACCOUNT_CPU_USER_ENTRY call in the system call entry path.
Signed-off-by: Paul Mackerras <paulus at samba.org>
Acked-by: Arnd Bergmann <arnd at arndb.de>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
commit 960cedb4e3eedec6394f224fc832c7a23f35a799
Author: Arnd Bergmann <arnd at arndb.de>
Date: Fri Nov 28 09:51:24 2008 +0000
powerpc/cell: Fix GDB watchpoints, again
An earlier patch from Jens Osterkamp attempted to fix GDB
watchpoints by enabling the DABRX register at boot time.
Unfortunately, this did not work on SMP setups, where
secondary CPUs were still using the power-on DABRX value.
This introduces the same change for secondary CPUs on cell
as well.
Reported-by: Ulrich Weigand <Ulrich.Weigand at de.ibm.com>
Tested-by: Ulrich Weigand <Ulrich.Weigand at de.ibm.com>
Signed-off-by: Arnd Bergmann <arnd at arndb.de>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit cc353c30bbdb84f4317a6c149ebb11cde2232e40
Author: Arnd Bergmann <arnd at arndb.de>
Date: Fri Nov 28 09:51:23 2008 +0000
powerpc/mpic: Don't reset affinity for secondary MPIC on boot
Kexec/kdump currently fails on the IBM QS2x blades when the kexec happens
on a CPU other than the initial boot CPU. It turns out that this is the
result of mpic_init trying to set affinity of each interrupt vector to the
current boot CPU.
As far as I can tell, the same problem is likely to exist on any
secondary MPIC, because they have to deliver interrupts to the first
output all the time. There are two potential solutions for this: either
not set up affinity at all for secondary MPICs, or assume that a single
CPU output is connected to the upstream interrupt controller and hardcode
affinity to that per architecture.
This patch implements the second approach, defaulting to the first output.
Currently, all known secondary MPICs are routed to their upstream port
using the first destination, so we hardcode that.
Signed-off-by: Arnd Bergmann <arnd at arndb.de>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit d015fe9951641b2d869a7ae4a690be2a05a9dc7f
Author: Arnd Bergmann <arnd at arndb.de>
Date: Fri Nov 28 09:51:22 2008 +0000
powerpc/cell/axon-msi: Retry on missing interrupt
The MSI capture logic for the axon bridge can sometimes
lose interrupts in case of high DMA and interrupt load,
when it signals an MSI interrupt to the MPIC interrupt
controller while we are already handling another MSI.
Each MSI vector gets written into a FIFO buffer in main
memory using DMA, and that DMA access is normally flushed
by the actual interrupt packet on the IOIF. An MMIO
register in the MSIC holds the position of the last
entry in the FIFO buffer that was written. However,
reading that position does not flush the DMA, so that
we can observe stale data in the buffer.
In a stress test, we have observed the DMA to arrive
up to 14 microseconds after reading the register.
This patch works around this problem by retrying the
access to the FIFO buffer.
We can reliably detect the conditioning by writing
an invalid MSI vector into the FIFO buffer after
reading from it, assuming that all MSIs we get
are valid. After detecting an invalid MSI vector,
we udelay(1) in the interrupt cascade for up to
100 times before giving up.
Signed-off-by: Arnd Bergmann <arnd at arndb.de>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 4a6186696e7f15b3ea4dafcdb64ee0703e0e4487
Author: Dave Hansen <dave at linux.vnet.ibm.com>
Date: Mon Nov 24 12:02:35 2008 +0000
powerpc: Fix boot freeze on machine with empty memory node
I got a bug report about a distro kernel not booting on a particular
machine. It would freeze during boot:
> ...
> Could not find start_pfn for node 1
> [boot]0015 Setup Done
> Built 2 zonelists in Node order, mobility grouping on. Total pages: 123783
> Policy zone: DMA
> Kernel command line:
> [boot]0020 XICS Init
> [boot]0021 XICS Done
> PID hash table entries: 4096 (order: 12, 32768 bytes)
> clocksource: timebase mult[7d0000] shift[22] registered
> Console: colour dummy device 80x25
> console handover: boot [udbg0] -> real [hvc0]
> Dentry cache hash table entries: 1048576 (order: 7, 8388608 bytes)
> Inode-cache hash table entries: 524288 (order: 6, 4194304 bytes)
> freeing bootmem node 0
I've reproduced this on 2.6.27.7. It is caused by commit
8f64e1f2d1e09267ac926e15090fd505c1c0cbcb ("powerpc: Reserve in bootmem
lmb reserved regions that cross NUMA nodes").
The problem is that Jon took a loop which was (in pseudocode):
for_each_node(nid)
NODE_DATA(nid) = careful_alloc(nid);
setup_bootmem(nid);
reserve_node_bootmem(nid);
and broke it up into:
for_each_node(nid)
NODE_DATA(nid) = careful_alloc(nid);
setup_bootmem(nid);
for_each_node(nid)
reserve_node_bootmem(nid);
The issue comes in when the 'careful_alloc()' is called on a node with
no memory. It falls back to using bootmem from a previously-initialized
node. But, bootmem has not yet been reserved when Jon's patch is
applied. It gives back bogus memory (0xc000000000000000) and pukes
later in boot.
The following patch collapses the loop back together. It also breaks
the mark_reserved_regions_for_nid() code out into a function and adds
some comments. I think a huge part of introducing this bug is because
for loop was too long and hard to read.
The actual bug fix here is the:
+ if (end_pfn <= node->node_start_pfn ||
+ start_pfn >= node_end_pfn)
+ continue;
Signed-off-by: Dave Hansen <dave at linux.vnet.ibm.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 4b824de9b18b8d1013e9fc9e4b0f855ced8cac2c
Author: Adhemerval Zanella <azanella at linux.vnet.ibm.com>
Date: Wed Nov 19 03:55:35 2008 +0000
powerpc: Fix IRQ assignment for some PCIe devices
Currently, some PCIe devices on POWER6 machines do not get interrupts
assigned correctly. The problem is that OF doesn't create an
"interrupt" property for them. The fix is for of_irq_map_pci to fall
back to using the value in the PCI interrupt-pin register in config
space, as we do when there is no OF device-tree node for the device.
I have verified that this works fine with a pair of Squib-E SAS
adapter on a P6-570.
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit a6e470fd1bbfea8e51d2b10b0713e802b782f19a
Merge: 8e36a5d6ad587d906f0ff677974e5edb0335db30 90f671301a5e2678cdc99f611cd842161c3bb87f
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 14:04:31 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: struct device - replace bus_id with dev_name(), dev_set_name()
parisc: fix kernel crash when unwinding a userspace process
parisc: __kernel_time_t is always long
commit 8e36a5d6ad587d906f0ff677974e5edb0335db30
Merge: 9bd062d9eaf9e790330f37d9f4518e1b95131f6c a98ee8c1c707fe3210b00ef9f806ba8e2bf35504
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 14:04:02 2008 -0800
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] fix regression in cifs_write_begin/cifs_write_end
commit 9bd062d9eaf9e790330f37d9f4518e1b95131f6c
Merge: 72244c0e68dd664b894adb34a8772a6e4673b4c1 af6d596fd603219b054c1c90fb16672a9fd441bd
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 13:06:47 2008 -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: prevent divide by zero error in cpu_avg_load_per_task, update
sched, cpusets: fix warning in kernel/cpuset.c
sched: prevent divide by zero error in cpu_avg_load_per_task
commit 72244c0e68dd664b894adb34a8772a6e4673b4c1
Merge: 93b10052f9146eab4e848b474baf10c2ea22acb3 2ed1cdcf9a83205d1343f29b630abff232eaa72c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 13:06:20 2008 -0800
Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
irq.h: fix missing/extra kernel-doc
genirq: __irq_set_trigger: change pr_warning to pr_debug
irq: fix typo
x86: apic honour irq affinity which was set in early boot
genirq: fix the affinity setting in setup_irq
genirq: keep affinities set from userspace across free/request_irq()
commit 93b10052f9146eab4e848b474baf10c2ea22acb3
Merge: 7bbc67fbf60b698b43692fc6ea16c526bf1c5e26 b0788caf7af773b6c2374590dabd3a205f0918a8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 13:05:46 2008 -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:
lockdep: consistent alignement for lockdep info
commit 7bbc67fbf60b698b43692fc6ea16c526bf1c5e26
Merge: 66a45cc4cc1c1f7d1ccae4d0fee261eab5560682 4f5a7f40ddbae98569acbb99118a98570315579c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 13:05:31 2008 -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:
ftrace: prevent recursion
tracing, doc: update mmiotrace documentation
x86, mmiotrace: fix buffer overrun detection
function tracing: fix wrong position computing of stack_trace
commit 66a45cc4cc1c1f7d1ccae4d0fee261eab5560682
Merge: 8639dad84e4fe83577006e8e2bd9da79c6c2c41e b627c8b17ccacba38c975bc0f69a49fc4e5261c9
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 13:01:04 2008 -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: always define DECLARE_PCI_UNMAP* macros
x86: fixup config space size of CPU functions for AMD family 11h
x86, bts: fix wrmsr and spinlock over kmalloc
x86, pebs: fix PEBS record size configuration
x86, bts: turn macro into static inline function
x86, bts: exclude ds.c from build when disabled
arch/x86/kernel/pci-calgary_64.c: change simple_strtol to simple_strtoul
x86: use limited register constraint for setnz
xen: pin correct PGD on suspend
x86: revert irq number limitation
x86: fixing __cpuinit/__init tangle, xsave_cntxt_init()
x86: fix __cpuinit/__init tangle in init_thread_xstate()
oprofile: fix an overflow in ppro code
commit 8639dad84e4fe83577006e8e2bd9da79c6c2c41e
Merge: 9297524f6a2885bfb4e2431d658cd1ffaefbda41 461cba2d294fe83297edf8a6556912812903dce1
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 13:00:21 2008 -0800
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/i915: Save/restore HWS_PGA on suspend/resume
drm: move drm vblank initialization/cleanup to driver load/unload
drm/i915: execbuffer pins objects, no need to ensure they're still in the GTT
drm/i915: Always read pipestat in irq_handler
drm/i915: Subtract total pinned bytes from available aperture size
drm/i915: Avoid BUG_ONs on VT switch with a wedged chipset.
drm/i915: Remove IMR masking during interrupt handler, and restart it if needed.
drm/i915: Manage PIPESTAT to control vblank interrupts instead of IMR.
commit 9297524f6a2885bfb4e2431d658cd1ffaefbda41
Merge: 8c7b905a2d131a8dd0b081b16c64b17db4ce9392 52b19ac993f1aeadbce15b55302be9a35346e235
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 12:34:22 2008 -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: Fix BUG_ON() in destroy_inode()
commit 8c7b905a2d131a8dd0b081b16c64b17db4ce9392
Merge: 1838e39214ee3e390f9c8150ea7454103b72ef83 a266d9f1253a38ec2d5655ebcd6846298b0554f4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 11:43:41 2008 -0800
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] powernow-k8: ignore out-of-range PstateStatus value
[CPUFREQ] Documentation: Add Blackfin to list of supported processors
commit 1838e39214ee3e390f9c8150ea7454103b72ef83
Author: frans <fransmeulenbroeks at gmail.com>
Date: Sat Nov 22 15:39:06 2008 +0100
Trivial Documentation/filesystems/ramfs-rootfs-initramfs.txt fix
A very minor patch on ramfs-rootfs-initramfs.txt: update the location
where CONFIG_INITRAMFS_SOURCE lives in menuconfig
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Acked-by: Rob Landley <rob at landley.net>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 42182c7850cdfbfdcf5f8763908a7a66b5ce9041
Merge: e2a2444a90ba12f123c9c59362ffe3ab278bccb9 b6283534a3e057f8268ca5448305900f74d12608
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 11:36:57 2008 -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 - Check model for Dell 92HD73xx laptops
ALSA: hda - mark Dell studio 1535 quirk
ALSA: hda - No 'Headphone as Line-out' swich without line-outs
ALSA: hda - Fix AFG power management on IDT 92HD* codecs
ALSA: hda - Fix caching of SPDIF status bits
ALSA: hda - Add a quirk for Dell Studio 15
ALSA: hda: Add STAC_DELL_M4_3 quirk
sound/sound_core: Fix sparse warnings
ALSA: hda: STAC_DELL_M6 EAPD
commit e2a2444a90ba12f123c9c59362ffe3ab278bccb9
Merge: 8decec78a3d9e240f14553284629ac4851ff3744 2ad49887150894b9ed6a87a76b409adceee6b074
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 11:34:17 2008 -0800
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
* 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6:
UBI: Don't exit from ubi_thread until kthread_should_stop() is true
UBI: fix EBADMSG handling
commit 8decec78a3d9e240f14553284629ac4851ff3744
Merge: 499c59c42967329d39481314a839d7669f5e1506 7b964f733798960c899dc40911329aee7bee25e4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 11:21:43 2008 -0800
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c-parport: Fix misplaced parport_release call
i2c: Remove i2c clients in reverse order
i2c/isp1301_omap: Build fixes
commit 499c59c42967329d39481314a839d7669f5e1506
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Fri Nov 28 11:48:37 2008 +0000
MN10300: Tighten up the code using case ranges
Compress a set of consecutive switch cases into a case-range.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f1ba3bc7b97ad0cc5886e5dadf4defba68f37819
Merge: 95c5e1f1e6e1788cc8b9acbe9379ae395ef64958 abd942194dcba2fa9d24d547b8acd4ef052eaf73
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 11:07:16 2008 -0800
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] Update default configuration.
[S390] Fix alignment of initial kernel stack.
[S390] pgtable.h: Fix oops in unmap_vmas for KVM processes
[S390] fix/cleanup sched_clock
[S390] fix system call parameter functions.
commit 95c5e1f1e6e1788cc8b9acbe9379ae395ef64958
Merge: b31a0fecd1dd01f1db406014a7c8a73983e04cc9 23d0a65cf229acd273b6f5a325c34d758a90d592
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 11:06:40 2008 -0800
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
toshiba_acpi: close race in toshiba_acpi driver
ACPICA: disable _BIF warning
ACPI: delete OSI(Linux) DMI dmesg spam
ACPICA: Allow _WAK method to return an Integer
ACPI: thinkpad-acpi: fix fan sleep/resume path
sony-laptop: printk tweak
sony-laptop: brightness regression fix
Revert "ACPI: don't enable control method power button as wakeup device when Fixed Power button is used"
ACPI suspend: Blacklist boxes that require us to set SCI_EN directly on resume
ACPI: scheduling in atomic via acpi_evaluate_integer ()
ACPI: battery: Convert discharge energy rate to current properly
ACPI: EC: count interrupts only if called from interrupt handler.
commit b31a0fecd1dd01f1db406014a7c8a73983e04cc9
Merge: 96b8936a9ed08746e47081458a5eb9e43a751e24 545f4e99dee7284ed57c79384c5c1d5ac58dcd59
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 11:05:21 2008 -0800
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: wacom - add support for new USB Tablet PCs
Input: replace spin_lock_bh with spin_lock_irqsave in ml_ff_playback
Input: i8042 - add Compal Hel80 laptop to nomux blacklist
Input: cm109 - add keymap for ATCom AU-100 phone
Input: fix the example of an input device driver
Input: psmouse - fix incorrect validate_byte check in OLPC protocol
Input: atkbd - cancel delayed work before freeing its structure
Input: atkbd - add keymap quirk for Inventec Symphony systems
Input: i8042 - add Dell XPS M1530 to nomux list
Input: elo - fix format string in elo driver
commit 96b8936a9ed08746e47081458a5eb9e43a751e24
Author: Christoph Hellwig <hch at lst.de>
Date: Tue Nov 25 08:10:03 2008 +0100
remove __ARCH_WANT_COMPAT_SYS_PTRACE
All architectures now use the generic compat_sys_ptrace, as should every
new architecture that needs 32bit compat (if we'll ever get another).
Remove the now superflous __ARCH_WANT_COMPAT_SYS_PTRACE define, and also
kill a comment about __ARCH_SYS_PTRACE that was added after
__ARCH_SYS_PTRACE was already gone.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Acked-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 16799c6a4d5156c6ee185b51b7586cca1aae0800
Merge: 211f05a034f49586fdd071abd174853217ec29ee 8ec2e24356e63dc298c6040557faf396410907ac
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Nov 30 10:38:22 2008 -0800
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: Make BUG() __noreturn.
commit 211f05a034f49586fdd071abd174853217ec29ee
Author: Arjan van de Ven <arjan at linux.intel.com>
Date: Sun Nov 23 16:57:36 2008 -0800
input: replace spin_lock_bh with spin_lock_irqsave in ml_ff_playback
ml_ff_playback() uses spin_(un)lock_bh. However this function is called
with interrupts disabled from erase_effect() in drivers/input/ff-core.c:196.
This is not permitted, and will result in a WARN_ON in the bottom half handling code.
This patch changes this function to just use spin_lock_irqsave() instead, solving
the problem and simplifying the locking logic.
This was reported as entry #106559 in kerneloops.org
Reported-by: kerneloops.org
Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 02d0e6753d8ab0173b63338157929e52eac86d12
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:38:34 2008 +0000
hotplug_memory_notifier section annotation
Same as for hotplug_cpu - we want static notifier_block in there in meminitdata,
to avoid false positives whenever it's used.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d3a307f32ec3554739033762672e533e2d246dae
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:38:24 2008 +0000
sn_pci_controller_fixup() should be __init
called only from __init
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ffb78a26169351f6c22cdae481b057d50d5d759b
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:38:14 2008 +0000
get xenbus_driver ->probe() "recognized" by modpost
... by giving the instances' names magic suffix recognized by modpost ;-/
Their ->probe() is __devinit
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit df6b07949b6cab9d119363d02ef63379160f6c82
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:38:04 2008 +0000
xen_play_dead() is __cpuinit
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 37af46efa5413c6f4c25d9a24b4c43f2cc718eed
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:37:54 2008 +0000
xen_setup_vcpu_info_placement() is not init on x86
... so get xen-ops.h in agreement with xen/smp.c
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 23a14b9e9db49ed5f7683857557c26c874d4abb6
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:37:44 2008 +0000
kvm_setup_secondary_clock() is cpuinit
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2236d252e001ea57d53cec1954f680e503f3b8bc
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:37:34 2008 +0000
enable_IR_x2apic() needs to be __init
calls __init, called only from __init
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ad04d31e5fb6b25308e6cdea6baa07d41871a3e0
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:37:14 2008 +0000
pci_setup() is init, not devinit
for fsck sake, it's used only when parsing kernel command line...
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4bcc17dd8e48b612d43a9b0a6faa9eaa358fa4bd
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:37:04 2008 +0000
alpha: pcibios_resource_to_bus() is callable from normal code
pci_enable_rom(), specifically.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 56d74dd5f7ad8b6b0979ce915d51cf03bcc57267
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:36:54 2008 +0000
tricky one: hisax sections
a) hisax_init_pcmcia() needs to be defined only if we have
CONFIG_HOTPLUG (no PCMCIA support otherwise) and can be declared
__devinit.
b) HiSax_inithardware() can go __init
c) hisax_register() is passing to checkcard() full-blown hisax_cs_setup_card():
checkcard(i, id, NULL, hisax_d_if->owner, hisax_cs_setup_card);
The problem with it is that
* hisax_cs_setup_card() is __devinit
* hisax_register() is not
* hisax_cs_setup_card() is a switch from hell, calling a lot of
setup_some_weirdcard() depending on card->typ. _These_ are also
__devinit.
However, in hisax_register() we have card->typ equal to
ISDN_CTYPE_DYNAMIC, which reduces hisax_cs_setup_card() to "nevermind
all that crap, just do nothing and return 2". So we add a
trimmed-down callback doing just that and passed to checkcard() by
hisax_register(). _This_ is non-init (we can stand the impact on
.text size).
Voila - no section warnings from drivers/isdn
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8419641450edc838a6ce7cdf0f99d262bf0af2d5
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:36:44 2008 +0000
cpuinit fixes in kernel/*
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b0385146bcdd24b0390c2b60fd05a083888835db
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:36:34 2008 +0000
uninorth-agp section mess
'aperture' is declared devinitdata (the whole word of it) and
is used from ->fetch_size() which can, AFAICS, be used on
!HOTPLUG after init time.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 37d33d151428a4ee648c855c0b49368de7804e7f
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:36:24 2008 +0000
rapidio section noise
functions calling devinit and called only from devinit
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f57628d76bd201a444ca822f3622522a44acbf60
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:36:14 2008 +0000
section errors in smc911x/smc91x
a) ->probe() can be __devinit; no need to put it into .text
b) calling __init stuff from it, OTOH, is wrong
c) ->remove() is __devexit fodder
Acked-by: rmk+kernel at arm.linux.org.uk
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5bac287ea51bb8678c3875d87a536071ef0fd590
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:36:04 2008 +0000
fix the section noise in sparc head.S
usual .text.head trick
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 1c4567aeed84a2746d78d4c1fe092222a559d43f
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:35:54 2008 +0000
m32r: section noise in head.S
usual "introduce .text.head, put it in front of TEXT_TEXT in vmlinux.lds.S,
make the stuff up to jump to start_kernel live in it", same as on other
targets.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8814b5050d183f00a25a087b550841797c0c2775
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:35:44 2008 +0000
section misannotation in ibmtr_cs
ibmtr_resume() is calling ibmtr_probe(), which is devinit. Whether
that's the right thing to do there is a separate question, but
since it's PCMCIA and thus will never compile without HOTPLUG...
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 43ced651d1272ced02ed5f1c2abc79e3354187f6
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:35:34 2008 +0000
ixgbe section fixes
ixgbe_init_interrupt_scheme() is called from ixgbe_resume(). Build that
with CONFIG_PM and without CONFIG_HOTPLUG and you've got a problem.
Several helpers called by it also are misannotated __devinit.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 31421a6f6ea88236cb17b6a24aa21e66a6138d4c
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:35:24 2008 +0000
rackmeter section fixes
* rackmeter_remove() reference needs devexit_p
* rackmeter_setup() is calls devinit and is called only from devinit
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ced7172ad94713f9023a3c279082402ac7750ba8
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:35:14 2008 +0000
gdth section fixes
PCI side of driver should be devinit, not init
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e669dae6141ff97d3c7566207f5de3b487dcf837
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:35:04 2008 +0000
of_platform_driver noise on sparce
switch to __init for those; unlike powerpc sparc has no hotplug support
for that stuff and their ->probe() tends to call __init functions while
being declared __devinit.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 30037818f7c1e11cb3742fbecd614ef3dc7b27bb
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:34:54 2008 +0000
advansys fix on ISA-less configs
The code
if (shost->dma_channel != NO_ISA_DMA)
free_dma(shost->dma_channel);
in there is triggerable only if we have CONFIG_ISA (we only set ->dma_channel to
something other than NO_ISA_DMA under #ifdef CONFIG_ISA). OTOH, free_dma() is
not guaranteed to be there in absense of CONFIG_ISA. IOW, driver runs into
undefined symbols on PCI-but-not-ISA configs (e.g. on frv) and it's a false
positive.
Fix: put the entire if () under #ifdef CONFIG_ISA; behaviour doesn't change and
dependency on free_dma() disappears for !CONFIG_ISA.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 2fceab0bd8d82509519e9b842a5a7234b2397fb4
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:34:44 2008 +0000
W1_MASTER_DS1WM should depend on HAVE_CLK
Uses clk_...() a lot
Acked-by: rmk+kernel at arm.linux.org.uk
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d16d7667f9c211e8d9b7e2365cc3d3a83fc6a8e2
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:34:34 2008 +0000
icside section warnings
icside_register_v[56] is called from (__devinit) icside_probe
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 596f1034190565529e507e1eb8df6def1c9f5560
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:34:24 2008 +0000
fix talitos
talitos_remove() can be called from talitos_probe() on failure
exit path, so it can't be __devexit.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 6005e3eb89db99f3737c8f5fe3d97f3262ed7919
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:34:14 2008 +0000
istallion section warnings
stli_findeisabrds() and stli_initbrds() are using __init and called only
from __init.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8c29890aef80702824e2284909ee301ef2430a3e
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:34:04 2008 +0000
sparc64 trivial section misannotations
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 409832f5484cd1e2d8812c3236dffb33d01c359b
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:33:54 2008 +0000
sparc32 cpuinit flase positives
All noise since we don't have CPU hotplug there. However, they
did expose something very odd-looking in there - poke_viking()
does a bunch of identical btfixup each time it's called (i.e.
for each CPU). That one is left alone for now; just the trivial
misannotation fixes.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 4ea8fb9c1cc67bee980dca589ec8d0d4e62858c7
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:33:44 2008 +0000
powerpc set_huge_psize() false positive
called only from __init, calls __init. Incidentally, it ought to be static
in file.
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7d6a8a1c487422b772201927c454930377d8cf7e
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:33:34 2008 +0000
false __cpuinit positives on alpha
pure noise - alpha doesn't have CPU hotplug
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 31168481c32c8a485e1003af9433124dede57f8d
Author: Al Viro <viro at ftp.linux.org.uk>
Date: Sat Nov 22 17:33:24 2008 +0000
meminit section warnings
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit af6d596fd603219b054c1c90fb16672a9fd441bd
Author: Ingo Molnar <mingo at elte.hu>
Date: Sat Nov 29 20:45:15 2008 +0100
sched: prevent divide by zero error in cpu_avg_load_per_task, update
Regarding the bug addressed in:
4cd4262: sched: prevent divide by zero error in cpu_avg_load_per_task
Linus points out that the fix is not complete:
> There's nothing that keeps gcc from deciding not to reload
> rq->nr_running.
>
> Of course, in _practice_, I don't think gcc ever will (if it decides
> that it will spill, gcc is likely going to decide that it will
> literally spill the local variable to the stack rather than decide to
> reload off the pointer), but it's a valid compiler optimization, and
> it even has a name (rematerialization).
>
> So I suspect that your patch does fix the bug, but it still leaves the
> fairly unlikely _potential_ for it to re-appear at some point.
>
> We have ACCESS_ONCE() as a macro to guarantee that the compiler
> doesn't rematerialize a pointer access. That also would clarify
> the fact that we access something unsafe outside a lock.
So make sure our nr_running value is immutable and cannot change
after we check it for nonzero.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 1583715ddb61f822041807a0f18b3b4845e88c76
Author: Ingo Molnar <mingo at elte.hu>
Date: Tue Nov 25 10:27:49 2008 +0100
sched, cpusets: fix warning in kernel/cpuset.c
this warning:
kernel/cpuset.c: In function ‘generate_sched_domains’:
kernel/cpuset.c:588: warning: ‘ndoms’ may be used uninitialized in this function
triggers because GCC does not recognize that ndoms stays uninitialized
only if doms is NULL - but that flow is covered at the end of
generate_sched_domains().
Help out GCC by initializing this variable to 0. (that's prudent anyway)
Also, this function needs a splitup and code flow simplification:
with 160 lines length it's clearly too long.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 2642b11295ebcc94843045933061bfbb263fce7f
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sat Nov 29 14:55:47 2008 +0100
ieee1394: sbp2: fix race condition in state change
An intermediate transition from _RUNNING to _IN_SHUTDOWN could have been
missed by the former code.
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit e47c1feb17e61ef4e2f245c0af0c5a8e2a7798b2
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Wed Nov 26 01:34:25 2008 +0100
ieee1394: fix list corruption (reported at module removal)
If there is more than one FireWire controller present, dummy_zero_addr
and dummy_max_addr were added multiple times to different lists, thus
corrupting the lists. Fix this by allocating them dynamically per host
instead of just once globally.
(Perhaps a better address space allocation algorithm could rid us of the
two dummy address spaces.)
Fixes http://bugzilla.kernel.org/show_bug.cgi?id=10129 .
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 9a5aa622dd4cd22b5e0fe83e4a9c0c768d4e2dea
Author: Jack Morgenstein <jackm at dev.mellanox.co.il>
Date: Fri Nov 28 21:29:46 2008 -0800
mlx4_core: Save/restore default port IB capability mask
Commit 7ff93f8b ("mlx4_core: Multiple port type support") introduced
support for different port types. As part of that support, SET_PORT
is invoked to set the port type during driver startup. However, as a
side-effect, for IB ports the invocation of this command also sets the
port's capability mask to zero (losing the default value set by FW).
To fix this, get the default ib port capabilities (via a MAD_IFC Port
Info query) during driver startup, and save them for use in the
mlx4_SET_PORT command when setting the port-type to Infiniband.
This patch fixes problems with subnet manager (SM) failover such as
<https://bugs.openfabrics.org/show_bug.cgi?id=1183>, which occurred
because the IsTrapSupported bit in the capability mask was zeroed.
Signed-off-by: Jack Morgenstein <jackm at dev.mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 23d0a65cf229acd273b6f5a325c34d758a90d592
Author: Arjan van de Ven <arjan at linux.intel.com>
Date: Fri Nov 28 08:19:09 2008 -0800
toshiba_acpi: close race in toshiba_acpi driver
the toshiba ACPI driver will, in a failure case, free the rfkill state
before stopping the polling timer that would use this state. More interesting,
in the same failure case handling, it calls the exit function, which also
frees the rfkill state, but after stopping the polling.
If the race happens, a NULL pointer is passed to rfkill_force_state()
which then causes a nice dereference.
Fix the race by just not doing the too-early freeing of the rfkill state.
This appears to be the cause of a hot issue on kerneloops.org; while I
have no solid evidence of that this patch will fix the issue, the race
appears rather real.
Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 7b964f733798960c899dc40911329aee7bee25e4
Author: Jean Delvare <khali at linux-fr.org>
Date: Fri Nov 28 15:24:39 2008 +0100
i2c-parport: Fix misplaced parport_release call
We shouldn't release the parallel port until we are actually done with
it.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 79b93e1359b1414b438f239c6e5e0ad91232e4c8
Author: Jean Delvare <khali at linux-fr.org>
Date: Fri Nov 28 15:24:38 2008 +0100
i2c: Remove i2c clients in reverse order
i2c clients should be removed in reverse order compared to the probe
(actually: bind) order. This matters when several clients depend on
each other.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Tested-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
commit d1846b0e7a1dc26f90fb0d75641aca9abb077ef9
Author: David Brownell <dbrownell at users.sourceforge.net>
Date: Fri Nov 28 15:24:38 2008 +0100
i2c/isp1301_omap: Build fixes
Build fixes for isp1301_omap; no behavior changes:
- fix incorrect probe() signature (it changed many months ago)
- provide missing functions on H3 and H4 boards
- "sparse" fixes (static, NULL-vs-0)
The H3 build bits subset some of the stuff that was previously in
the OMAP tree but never went to mainline.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit ee8a1a0a1a5817accd03ced7e7ffde3a4430f485
Author: Jan Scholz <Scholz at fias.uni-frankfurt.de>
Date: Wed Nov 26 15:33:45 2008 +0100
HID: Apple ALU wireless keyboards are bluetooth devices
While parsing 'hid_blacklist' in the apple alu wireless keyboard is not found.
This happens because in the blacklist it is declared with HID_USB_DEVICE
although the keyboards are really bluetooth devices. The same holds for
'apple_devices' list.
This patch fixes it by changing HID_USB_DEVICE to HID_BLUETOOTH_DEVICE in those
two lists.
Signed-off-by: Jan Scholz <Scholz at fias.uni-frankfurt.de>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit af38d90d6a5e135b546a3f86222ba2ad895ba4ae
Merge: 487ff32082a9bd7489d8185cf7d7a2fdf18a22fa a730b327ca70f0e4d933202e3979e96613c3585f
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Thu Nov 27 23:50:31 2008 +0000
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
commit 487ff32082a9bd7489d8185cf7d7a2fdf18a22fa
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Thu Nov 27 11:13:58 2008 +0000
Allow architectures to override copy_user_highpage()
With aliasing VIPT cache support, the ARM implementation of
clear_user_page() and copy_user_page() sets up a temporary kernel space
mapping such that we have the same cache colour as the userspace page.
This avoids having to consider any userspace aliases from this operation.
However, when highmem is enabled, kmap_atomic() have to setup mappings.
The copy_user_highpage() and clear_user_highpage() call these functions
before delegating the copies to copy_user_page() and clear_user_page().
The effect of this is that each of the *_user_highpage() functions setup
their own kmap mapping, followed by the *_user_page() functions setting
up another mapping. This is rather wasteful.
Thankfully, copy_user_highpage() can be overriden by architectures by
defining __HAVE_ARCH_COPY_USER_HIGHPAGE. However, replacement of
clear_user_highpage() is more difficult because its inline definition
is not conditional. It seems that you're expected to define
__HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE and provide a replacement
__alloc_zeroed_user_highpage() implementation instead.
The allocation itself is fine, so we don't want to override that. What
we really want to do is to override clear_user_highpage() with our own
version which doesn't kmap_atomic() unnecessarily.
Other VIPT architectures (PARISC and SH) would also like to override
this function as well.
Acked-by: Hugh Dickins <hugh at veritas.com>
Acked-by: James Bottomley <James.Bottomley at HansenPartnership.com>
Acked-by: Paul Mundt <lethal at linux-sh.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 52b19ac993f1aeadbce15b55302be9a35346e235
Author: Jan Kara <jack at suse.cz>
Date: Tue Sep 23 18:24:08 2008 +0200
udf: Fix BUG_ON() in destroy_inode()
udf_clear_inode() can leave behind buffers on mapping's i_private list (when
we truncated preallocation). Call invalidate_inode_buffers() so that the list
is properly cleaned-up before we return from udf_clear_inode(). This is ugly
and suggest that we should cleanup preallocation earlier than in clear_inode()
but currently there's no such call available since drop_inode() is called under
inode lock and thus is unusable for disk operations.
Signed-off-by: Jan Kara <jack at suse.cz>
commit a730b327ca70f0e4d933202e3979e96613c3585f
Author: Marek Vasut <marek.vasut at gmail.com>
Date: Thu Nov 20 17:34:57 2008 +0100
[ARM] pxa/palmtx: misc fixes to use generic GPIO API
Signed-off-by: Marek Vasut <marek.vasut at gmail.com>
Signed-off-by: Eric Miao <eric.miao at marvell.com>
commit b627c8b17ccacba38c975bc0f69a49fc4e5261c9
Author: Joerg Roedel <joerg.roedel at amd.com>
Date: Thu Nov 20 20:49:56 2008 +0100
x86: always define DECLARE_PCI_UNMAP* macros
Impact: fix boot crash on AMD IOMMU if CONFIG_GART_IOMMU is off
Currently these macros evaluate to a no-op except the kernel is compiled
with GART or Calgary support. But we also need these macros when we have
SWIOTLB, VT-d or AMD IOMMU in the kernel. Since we always compile at
least with SWIOTLB we can define these macros always.
This patch is also for stable backport for the same reason the SWIOTLB
default selection patch is.
Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
Cc: <stable at kernel.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 6417a917b564106dcf2b8f42687f92ad94635ddd
Merge: 47fd6f7c94e15eb5f97dd1cbb0427a46b03c8185 723fdb781abfe78d8ba7d911abbb581722348aa7
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Thu Nov 27 11:13:10 2008 +0000
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
commit abd942194dcba2fa9d24d547b8acd4ef052eaf73
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date: Thu Nov 27 11:05:59 2008 +0100
[S390] Update default configuration.
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 0778dc3a624b48cf80072b04405cacd1ad4079be
Author: Heiko Carstens <heiko.carstens at de.ibm.com>
Date: Thu Nov 27 11:05:58 2008 +0100
[S390] Fix alignment of initial kernel stack.
We need an alignment of 16384 bytes for the initial kernel stack if
the kernel is configured for 16384 bytes stacks but the linker script
currently guarantees only an alignment of 8192 bytes.
So fix this and simply use THREAD_SIZE as alignment value which will
always do the right thing.
Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 2944a5c971c12766e2438ea407ec3567949c32b7
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Thu Nov 27 11:05:57 2008 +0100
[S390] pgtable.h: Fix oops in unmap_vmas for KVM processes
When running several kvm processes with lots of memory overcommitment,
we have seen an oops during process shutdown:
------------[ cut here ]------------
Kernel BUG at 0000000000193434 [verbose debug info unavailable]
addressing exception: 0005 [#1] PREEMPT SMP
Modules linked in: kvm sunrpc qeth_l2 dm_mod qeth ccwgroup
CPU: 10 Not tainted 2.6.28-rc4-kvm-bigiron-00521-g0ccca08-dirty #8
Process kuli (pid: 14460, task: 0000000149822338, ksp: 0000000024f57650)
Krnl PSW : 0704e00180000000 0000000000193434 (unmap_vmas+0x884/0xf10)
R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3 CC:2 PM:0 EA:3
Krnl GPRS: 0000000000000002 0000000000000000 000000051008d000 000003e05e6034e0
00000000001933f6 00000000000001e9 0000000407259e0a 00000002be88c400
00000200001c1000 0000000407259608 0000000407259e08 0000000024f577f0
0000000407259e09 0000000000445fa8 00000000001933f6 0000000024f577f0
Krnl Code: 0000000000193426: eb22000c000d sllg %r2,%r2,12
000000000019342c: a7180000 lhi %r1,0
0000000000193430: b2290012 iske %r1,%r2
>0000000000193434: a7110002 tmll %r1,2
0000000000193438: a7840006 brc 8,193444
000000000019343c: 9602c000 oi 0(%r12),2
0000000000193440: 96806000 oi 0(%r6),128
0000000000193444: a7110004 tmll %r1,4
Call Trace:
([<00000000001933f6>] unmap_vmas+0x846/0xf10)
[<0000000000199680>] exit_mmap+0x210/0x458
[<000000000012a8f8>] mmput+0x54/0xfc
[<000000000012f714>] exit_mm+0x134/0x144
[<000000000013120c>] do_exit+0x240/0x878
[<00000000001318dc>] do_group_exit+0x98/0xc8
[<000000000013e6b0>] get_signal_to_deliver+0x30c/0x358
[<000000000010bee0>] do_signal+0xec/0x860
[<0000000000112e30>] sysc_sigpending+0xe/0x22
[<000002000013198a>] 0x2000013198a
INFO: lockdep is turned off.
Last Breaking-Event-Address:
[<00000000001a68d0>] free_swap_and_cache+0x1a0/0x1a4
<4>---[ end trace bc19f1d51ac9db7c ]---
The faulting instruction is the storage key operation (iske) in
ptep_rcp_copy (called by pte_clear, called by unmap_vmas). iske
reads dirty and reference bit information for a physical page and
requires a valid physical address. Since we are in pte_clear, we
cannot rely on the pte containing a valid address. Fortunately we
dont need these information in pte_clear - after all there is no
mapping. The best fix is to remove the needless call to ptep_rcp_copy
that contains the iske.
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 8107d8296baff899db89c1716fe8af69a5b19d18
Author: Christian Borntraeger <borntraeger at de.ibm.com>
Date: Thu Nov 27 11:05:56 2008 +0100
[S390] fix/cleanup sched_clock
CONFIG_PRINTK_TIME reveals that sched_clock has a wrong offset during boot:
..
[ 0.000000] Movable zone: 0 pages used for memmap
[ 0.000000] Built 1 zonelists in Zone order, mobility grouping on. Total pages: 775679
[ 0.000000] Kernel command line: dasd=4b6c root=/dev/dasda1 ro noinitrd
[ 0.000000] PID hash table entries: 4096 (order: 12, 32768 bytes)
[6920575.975232] console [ttyS0] enabled
[6920575.987586] Dentry cache hash table entries: 524288 (order: 10, 4194304 bytes)
[6920575.991404] Inode-cache hash table entries: 262144 (order: 9, 2097152 bytes)
..
The s390 implementation of sched_clock uses the store clock instruction and
subtracts jiffies_timer_cc.
jiffies_timer_cc is a local variable in arch/s390/kernel/time.c and only used
for sched_clock and monotonic clock. For historical reasons there is an offset
on that value. With todays code this offset is unnecessary. By removing that
offset we can get a sched_clock which returns the nanoseconds after time_init.
This improves CONFIG_PRINTK_TIME.
Since sched_clock is the only user, I have also renamed jiffies_timer_cc to
sched_clock_base_cc. In addition, the local variable init_timer_cc is redundant
and can be romved as well.
Signed-off-by: Christian Borntraeger <borntraeger at de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 59da21398e680e8100625d689c8bebee6a139e93
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date: Thu Nov 27 11:05:55 2008 +0100
[S390] fix system call parameter functions.
syscall_get_nr() currently returns a valid result only if the call
chain of the traced process includes do_syscall_trace_enter(). But
collect_syscall() can be called for any sleeping task, the result of
syscall_get_nr() in general is completely bogus.
To make syscall_get_nr() work for any sleeping task the traps field
in pt_regs is replace with svcnr - the system call number the process
is executing. If svcnr == 0 the process is not on a system call path.
The syscall_get_arguments and syscall_set_arguments use regs->gprs[2]
for the first system call parameter. This is incorrect since gprs[2]
may have been overwritten with the system call number if the call
chain includes do_syscall_trace_enter. Use regs->orig_gprs2 instead.
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 4cd4262034849da01eb88659af677b69f8169f06
Author: Steven Rostedt <rostedt at goodmis.org>
Date: Wed Nov 26 21:04:24 2008 -0500
sched: prevent divide by zero error in cpu_avg_load_per_task
Impact: fix divide by zero crash in scheduler rebalance irq
While testing the branch profiler, I hit this crash:
divide error: 0000 [#1] PREEMPT SMP
[...]
RIP: 0010:[<ffffffff8024a008>] [<ffffffff8024a008>] cpu_avg_load_per_task+0x50/0x7f
[...]
Call Trace:
<IRQ> <0> [<ffffffff8024fd43>] find_busiest_group+0x3e5/0xcaa
[<ffffffff8025da75>] rebalance_domains+0x2da/0xa21
[<ffffffff80478769>] ? find_next_bit+0x1b2/0x1e6
[<ffffffff8025e2ce>] run_rebalance_domains+0x112/0x19f
[<ffffffff8026d7c2>] __do_softirq+0xa8/0x232
[<ffffffff8020ea7c>] call_softirq+0x1c/0x3e
[<ffffffff8021047a>] do_softirq+0x94/0x1cd
[<ffffffff8026d5eb>] irq_exit+0x6b/0x10e
[<ffffffff8022e6ec>] smp_apic_timer_interrupt+0xd3/0xff
[<ffffffff8020e4b3>] apic_timer_interrupt+0x13/0x20
The code for cpu_avg_load_per_task has:
if (rq->nr_running)
rq->avg_load_per_task = rq->load.weight / rq->nr_running;
The runqueue lock is not held here, and there is nothing that prevents
the rq->nr_running from going to zero after it passes the if condition.
The branch profiler simply made the race window bigger.
This patch saves off the rq->nr_running to a local variable and uses that
for both the condition and the division.
Signed-off-by: Steven Rostedt <srostedt at redhat.com>
Peter Zijlstra <peterz at infradead.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 4f5a7f40ddbae98569acbb99118a98570315579c
Author: Lai Jiangshan <laijs at cn.fujitsu.com>
Date: Thu Nov 27 10:21:46 2008 +0800
ftrace: prevent recursion
Impact: prevent unnecessary stack recursion
if the resched flag was set before we entered, then don't reschedule.
Signed-off-by: Lai Jiangshan <laijs at cn.fujitsu.com>
Acked-by: Steven Rostedt <rostedt at goodmis.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e899b6485c332aa2d7510739507ab5e5d7b28e59
Author: Lin Ming <ming.m.lin at intel.com>
Date: Thu Nov 27 14:42:30 2008 +0800
ACPICA: disable _BIF warning
A generic work-around from ACPICA is in the queue,
but since Linux has a work-around in its battery
driver, we can disable this warning now.
Allow _BIF method to return an Package with Buffer elements
http://bugzilla.kernel.org/show_bug.cgi?id=11822
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit a6e0887f21bbab337ee32d9c0a84d7c0b6e9141b
Author: Len Brown <len.brown at intel.com>
Date: Sat Nov 8 01:21:10 2008 -0500
ACPI: delete OSI(Linux) DMI dmesg spam
Linux will continue to ignore OSI(Linux),
except for a white-list containing a few systems.
So delete the black-list,
and stop soliciting user-feedback on the console.
Signed-off-by: Len Brown <len.brown at intel.com>
commit 95a28ed08619cc70f31611886ac7b26ab0e462dc
Author: Bob Moore <robert.moore at intel.com>
Date: Thu Nov 13 11:01:34 2008 +0800
ACPICA: Allow _WAK method to return an Integer
This can happen if the _WAK method returns nothing (as per ACPI
1.0) but does return an integer if the implicit return mechanism
is enabled. This is the only method that has this problem,
since it is also defined to return a package of two integers
(ACPI 1.0b+). In all other cases, if a method returns an object
when one was not expected, no warning is issued.
Signed-off-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Lin Ming <ming.m.lin at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 0081b162023690877e0096ef17a82ba1969befa8
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Sun Nov 9 10:54:02 2008 -0200
ACPI: thinkpad-acpi: fix fan sleep/resume path
This fixes a regression from v2.6.27, caused by commit
5814f737e1cd2cfa2893badd62189acae3e1e1fd, "ACPI: thinkpad-acpi:
attempt to preserve fan state on resume".
It is possible for fan_suspend() to fail to properly initialize
fan_control_desired_level as required by fan_resume(), resulting on
the fan always being set to level 7 on resume if the user didn't
touch the fan controller.
In order to get fan sleep/resume handling to work right:
1. Fix the fan_suspend handling of the T43 firmware quirk. If it is
still undefined, we didn't touch the fan yet and that means we have no
business doing it on resume.
2. Store the fan level on its own variable to avoid any possible
issues with hijacking fan_control_desired_level (which isn't supposed
to have anything other than 0-7 in it, anyway).
3. Change the fan_resume code to me more straightforward to understand
(although we DO optimize the boolean logic there, otherwise it looks
disgusting).
4. Add comments to help understand what the code is supposed to be
doing.
5. Change fan_set_level to be less strict about how auto and
full-speed modes are requested.
http://bugzilla.kernel.org/show_bug.cgi?id=11982
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Reported-by: Tino Keitel <tino.keitel at tikei.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 3fedd90fdf17643df1da473c5da983137d51bbdb
Author: Alessandro Guido <ag at alessandroguido.name>
Date: Wed Nov 12 23:13:35 2008 +0100
sony-laptop: printk tweak
There's no need to print "Sony: " just after "sony-laptop: " (DRV_PFX).
Signed-off-by: Alessandro Guido <ag at alessandroguido.name>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 38cfc148e1bc470175b3ad131db7dd7bdcff37ee
Author: Alessandro Guido <ag at alessandroguido.name>
Date: Wed Nov 12 23:03:28 2008 +0100
sony-laptop: brightness regression fix
After commit 540b8bb9c33935183ceb5bed466a42ad72b2af56:
sony-laptop: fingers off backlight if video.ko is serving this functionality
I can't set brightness on my sony laptop (nothing in /sys/class/backlight).
dmesg says "sony-laptop: Sony: Brightness ignored, must be controlled by ACPI
video driver".
The function acpi_video_backlight_support returns 0 if we should use the
vendor-specific backlight support, while non-0 if the ACPI generic should
be used. Because of this, the check introduced by the said commit appears
reversed.
Signed-off-by: Alessandro Guido <ag at alessandroguido.name>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 3bdca1b863c1ebcb2244fc0cb683876d7330e62b
Author: Len Brown <len.brown at intel.com>
Date: Wed Nov 26 17:55:15 2008 -0500
Revert "ACPI: don't enable control method power button as wakeup device when Fixed Power button is used"
This reverts commit faee816b1502385dc9bc5abf2960d1cc645844d1.
http://bugzilla.kernel.org/show_bug.cgi?id=12091
Signed-off-by: Len Brown <len.brown at intel.com>
commit 65df78473ffbf3bff5e2034df1638acc4f3ddd50
Author: Rafael J. Wysocki <rjw at sisk.pl>
Date: Wed Nov 26 17:53:13 2008 -0500
ACPI suspend: Blacklist boxes that require us to set SCI_EN directly on resume
Some Apple boxes evidently require us to set SCI_EN on resume
directly, because if we don't do that, they hung somewhere in the
resume code path. Moreover, on these boxes it is not sufficient to
use acpi_enable() to turn ACPI on during resume. All of this is
against the ACPI specification which states that (1) the BIOS is
supposed to return from the S3 sleep state with ACPI enabled
(SCI_EN set) and (2) the SCI_EN bit is owned by the hardware and we
are not supposed to change it.
For this reason, blacklist the affected systems so that the SCI_EN
bit is set during resume on them.
[NOTE: Unconditional setting SCI_EN for all system on resume doesn't
work, because it makes some other systems crash (that's to be
expected). Also, it is not entirely clear right now if all of the
Apple boxes require this workaround.]
This patch fixes the recent regression tracked as
http://bugzilla.kernel.org/show_bug.cgi?id=12038
Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Tested-by: Tino Keitel <tino.keitel at gmx.de>
Tested-by: Bob Copeland <me at bobcopeland.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 40599072dca3ec7d4c9ff8271978be169f974638
Author: Pavel Machek <pavel at suse.cz>
Date: Tue Nov 25 12:05:08 2008 +0100
ACPI: scheduling in atomic via acpi_evaluate_integer ()
Now I know why I had strange "scheduling in atomic" problems:
acpi_evaluate_integer() does malloc(..., irqs_disabled() ? GFP_ATOMIC
: GFP_KERNEL)... which is (of course) broken.
There's no way to reliably tell if we need GFP_ATOMIC or not from
code, this one for example fails to detect spinlocks held.
Fortunately, allocation seems small enough to be done on stack.
Signed-off-by: Pavel Machek <pavel at suse.cz>
Acked-by: Bob Moore <robert.moore at intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 723fdb781abfe78d8ba7d911abbb581722348aa7
Author: Tero Kristo <tero.kristo at nokia.com>
Date: Wed Nov 26 14:35:16 2008 -0800
ARM: OMAP: Fixes for suspend / resume GPIO wake-up handling
Use the correct wake-up enable register, and make it
work with 34xx also.
Signed-off-by: Tero Kristo <tero.kristo at nokia.com>
Signed-off-by: Kevin Hilman <khilman at deeprootsystems.com>
Signed-off-by: Tony Lindgren <tony at atomide.com>
commit 558073dd56707864f09d563b64e7c37c021e89d2
Author: Alexey Starikovskiy <aystarik at gmail.com>
Date: Fri Nov 21 22:41:01 2008 +0800
ACPI: battery: Convert discharge energy rate to current properly
ACPI battery interface reports its state either in mW or in mA, and
discharge rate in your case is reported in mW. power_supply interface
does not have such a parameter, so current_now parameter is used
for all cases. But in case of mW, reported discharge should
be converted into mA.
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Tested-by: Ferenc Wagner <wferi at niif.hu>
Signed-off-by: Len Brown <len.brown at intel.com>
commit 90f671301a5e2678cdc99f611cd842161c3bb87f
Author: Kay Sievers <kay.sievers at vrfy.org>
Date: Fri Nov 7 01:42:46 2008 +0100
parisc: struct device - replace bus_id with dev_name(), dev_set_name()
(I did not compile or test it, please let me know, or help fixing
it, if something is wrong with the conversion)
This patch is part of a larger patch series which will remove
the "char bus_id[20]" name string from struct device. The device
name is managed in the kobject anyway, and without any size
limitation, and just needlessly copied into "struct device".
To set and read the device name dev_name(dev) and dev_set_name(dev)
must be used. If your code uses static kobjects, which it shouldn't
do, "const char *init_name" can be used to statically provide the
name the registered device should have. At registration time, the
init_name field is cleared, to enforce the use of dev_name(dev) to
access the device name at a later time.
We need to get rid of all occurrences of bus_id in the entire tree
to be able to enable the new interface. Please apply this patch,
and possibly convert any remaining remaining occurrences of bus_id.
We want to submit a patch to -next, which will remove bus_id from
"struct device", to find the remaining pieces to convert, and finally
switch over to the new api, which will remove the 20 bytes array
and does no longer have a size limitation.
Thanks,
Kay
Cc: Matthew Wilcox <matthew at wil.cx>
Cc: linux-parisc at vger.kernel.org
Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>
commit 7a3f5134a8f5bd7fa38b5645eef05e8a4eb62951
Author: Helge Deller <deller at gmx.de>
Date: Wed Nov 26 12:46:22 2008 -0800
parisc: fix kernel crash when unwinding a userspace process
Any user on existing parisc 32- and 64bit-kernels can easily crash
the kernel and as such enforce a DSO.
A simple testcase is available here:
http://gsyprf10.external.hp.com/~deller/crash.tgz
The problem is introduced by the fact, that the handle_interruption()
crash handler calls the show_regs() function, which in turn tries to
unwind the stack by calling parisc_show_stack(). Since the stack contains
userspace addresses, a try to unwind the stack is dangerous and useless
and leads to the crash.
The fix is trivial: For userspace processes
a) avoid to unwind the stack, and
b) avoid to resolve userspace addresses to kernel symbol names.
While touching this code, I converted print_symbol() to %pS
printk formats and made parisc_show_stack() static.
An initial patch for this was written by Kyle McMartin back in August:
http://marc.info/?l=linux-parisc&m=121805168830283&w=2
Compile and run-tested with a 64bit parisc kernel.
Signed-off-by: Helge Deller <deller at gmx.de>
Cc: Grant Grundler <grundler at parisc-linux.org>
Cc: Matthew Wilcox <matthew at wil.cx>
Cc: <stable at kernel.org> [2.6.25.x, 2.6.26.x, 2.6.27.x, earlier...]
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>
commit 9860d1b08b082ffb54c4b7827c48c2728e12ba21
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date: Sun Nov 16 12:04:13 2008 +0100
parisc: __kernel_time_t is always long
__kernel_time_t is always long on PA-RISC, irrespective of CONFIG_64BIT,
hence move it out of the #ifdef CONFIG_64BIT / #else / #endif block.
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Kyle McMartin <kyle at mcmartin.ca>
commit 7b4d469228a92a00e412675817cedd60133de38a
Author: Alexey Starikovskiy <astarikovskiy at suse.de>
Date: Thu Nov 13 12:00:03 2008 +0300
ACPI: EC: count interrupts only if called from interrupt handler.
fix 2.6.28 EC interrupt storm regression
Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
Signed-off-by: Len Brown <len.brown at intel.com>
commit a98ee8c1c707fe3210b00ef9f806ba8e2bf35504
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed Nov 26 19:32:33 2008 +0000
[CIFS] fix regression in cifs_write_begin/cifs_write_end
The conversion to write_begin/write_end interfaces had a bug where we
were passing a bad parameter to cifs_readpage_worker. Rather than
passing the page offset of the start of the write, we needed to pass the
offset of the beginning of the page. This was reliably showing up as
data corruption in the fsx-linux test from LTP.
It also became evident that this code was occasionally doing unnecessary
read calls. Optimize those away by using the PG_checked flag to indicate
that the unwritten part of the page has been initialized.
CC: Nick Piggin <npiggin at suse.de>
Acked-by: Dave Kleikamp <shaggy at us.ibm.com>
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 545f4e99dee7284ed57c79384c5c1d5ac58dcd59
Author: Ping Cheng <pingc at wacom.com>
Date: Mon Nov 24 11:44:27 2008 -0500
Input: wacom - add support for new USB Tablet PCs
Signed-off-by: Ping Cheng <pingc at wacom.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 461cba2d294fe83297edf8a6556912812903dce1
Author: Peng Li <peng.li at intel.com>
Date: Tue Nov 18 12:39:02 2008 +0800
drm/i915: Save/restore HWS_PGA on suspend/resume
It fixes suspend/resume failure of xf86-video-intel dri2
branch. As dri2 branch doesn't call I830DRIResume() to restore
hardware status page anymore, we need to preserve
this register across suspend/resume.
Signed-off-by: Peng Li <peng.li at intel.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 2fd36a5d6e830269a37f0f6ccfd34ee0517ebc7d
Author: Eric Miao <eric.miao at marvell.com>
Date: Wed Nov 26 12:51:42 2008 +0800
[ARM] pxa/corgi: update default config to exclude tosa from being built
Signed-off-by: Eric Miao <eric.miao at marvell.com>
commit 72e9622c2a2eb73d82c716504cc93d22cd3cfd8e
Author: Guennadi Liakhovetski <lg at denx.de>
Date: Tue Nov 25 18:57:08 2008 +0100
[ARM] pxa/pcm990: use negative number for an invalid GPIO in camera data
0 is a valid GPIO number, use a negative number to specify, that this camera
doesn't have a GPIO for bus-width switching.
Signed-off-by: Guennadi Liakhovetski <lg at denx.de>
Signed-off-by: Eric Miao <eric.miao at marvell.com>
commit ffd565a8b817d1eb4b25184e8418e8d96c3f56f6
Author: Andreas Herrmann <andreas.herrmann3 at amd.com>
Date: Tue Nov 25 17:18:03 2008 +0100
x86: fixup config space size of CPU functions for AMD family 11h
Impact: extend allowed configuration space access on 11h CPUs from 256 to 4K
Signed-off-by: Andreas Herrmann <andreas.herrmann3 at amd.com>
Acked-by: Jesse Barnes <jbarnes at virtuousgeek.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 147dcf5489fb86c4bfe400520186f9f11b304783
Author: Amit Kucheria <amit.kucheria at verdurent.com>
Date: Tue Nov 25 15:11:12 2008 -0800
ARM: OMAP: Typo fix for clock_allow_idle
The second clk_deny_idle instance should be clk_allow_idle instead.
Signed-off-by: Amit Kucheria <amit.kucheria at verdurent.com>
Signed-off-by: Tony Lindgren <tony at atomide.com>
commit 031bb27c4bf77c2f60b3f3dea8cce63ef0d1fba9
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sat Nov 22 12:38:58 2008 +0100
firewire: fw-sbp2: another iPod mini quirk entry
Add another model ID of a broken firmware to prevent early I/O errors
by acesses at the end of the disk. Reported at linux1394-user,
http://marc.info/?t=122670842900002
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 9e0de91011ef6fe6eb3bb63f7ea15f586955660a
Author: Stefan Richter <stefanr at s5r6.in-berlin.de>
Date: Sat Nov 22 12:38:24 2008 +0100
ieee1394: sbp2: another iPod mini quirk entry
Add another model ID of a broken firmware to prevent early I/O errors
by acesses at the end of the disk. Reported at linux1394-user,
http://marc.info/?t=122670842900002
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit a266d9f1253a38ec2d5655ebcd6846298b0554f4
Author: Andreas Herrmann <andreas.herrmann3 at amd.com>
Date: Fri Nov 21 14:49:25 2008 +0100
[CPUFREQ] powernow-k8: ignore out-of-range PstateStatus value
A workaround for AMD CPU family 11h erratum 311 might cause that the
P-state Status Register shows a "current P-state" which is larger than
the "current P-state limit" in P-state Current Limit Register. For the
wrong P-state value there is no ACPI _PSS object defined and
powernow-k8/cpufreq can't determine the proper CPU frequency for that
state.
As a consequence this can cause a panic during boot (potentially with
all recent kernel versions -- at least I have reproduced it with
various 2.6.27 kernels and with the current .28 series), as an
example:
powernow-k8: Found 1 AMD Turion(tm)X2 Ultra DualCore Mobile ZM-82 processors (2 \
)
powernow-k8: 0 : pstate 0 (2200 MHz)
powernow-k8: 1 : pstate 1 (1100 MHz)
powernow-k8: 2 : pstate 2 (600 MHz)
BUG: unable to handle kernel paging request at ffff88086e7528b8
IP: [<ffffffff80486361>] cpufreq_stats_update+0x4a/0x5f
PGD 202063 PUD 0
Oops: 0002 [#1] SMP
last sysfs file:
CPU 1
Modules linked in:
Pid: 1, comm: swapper Not tainted 2.6.28-rc3-dirty #16
RIP: 0010:[<ffffffff80486361>] [<ffffffff80486361>] cpufreq_stats_update+0x4a/0\
f
Synaptics claims to have extended capabilities, but I'm not able to read them.<6\
6
RAX: 0000000000000000 RBX: 0000000000000001 RCX: ffff88006e7528c0
RDX: 00000000ffffffff RSI: ffff88006e54af00 RDI: ffffffff808f056c
RBP: 00000000fffee697 R08: 0000000000000003 R09: ffff88006e73f080
R10: 0000000000000001 R11: 00000000002191c0 R12: ffff88006fb83c10
R13: 00000000ffffffff R14: 0000000000000001 R15: 0000000000000000
FS: 0000000000000000(0000) GS:ffff88006fb50740(0000) knlGS:0000000000000000
Unable to initialize Synaptics hardware.
CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b
CR2: ffff88086e7528b8 CR3: 0000000000201000 CR4: 00000000000006e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process swapper (pid: 1, threadinfo ffff88006fb82000, task ffff88006fb816d0)
Stack:
ffff88006e74da50 0000000000000000 ffff88006e54af00 ffffffff804863c7
ffff88006e74da50 0000000000000000 00000000ffffffff 0000000000000000
ffff88006fb83c10 ffffffff8024b46c ffffffff808f0560 ffff88006fb83c10
Call Trace:
[<ffffffff804863c7>] ? cpufreq_stat_notifier_trans+0x51/0x83
[<ffffffff8024b46c>] ? notifier_call_chain+0x29/0x4c
[<ffffffff8024b561>] ? __srcu_notifier_call_chain+0x46/0x61
[<ffffffff8048496d>] ? cpufreq_notify_transition+0x93/0xa9
[<ffffffff8021ab8d>] ? powernowk8_target+0x1e8/0x5f3
[<ffffffff80486687>] ? cpufreq_governor_performance+0x1b/0x20
[<ffffffff80484886>] ? __cpufreq_governor+0x71/0xa8
[<ffffffff80484b21>] ? __cpufreq_set_policy+0x101/0x13e
[<ffffffff80485bcd>] ? cpufreq_add_dev+0x3f0/0x4cd
[<ffffffff8048577a>] ? handle_update+0x0/0x8
[<ffffffff803c2062>] ? sysdev_driver_register+0xb6/0x10d
[<ffffffff8056592c>] ? powernowk8_init+0x0/0x7e
[<ffffffff8048604c>] ? cpufreq_register_driver+0x8f/0x140
[<ffffffff80209056>] ? _stext+0x56/0x14f
[<ffffffff802c2234>] ? proc_register+0x122/0x17d
[<ffffffff802c23a0>] ? create_proc_entry+0x73/0x8a
[<ffffffff8025c259>] ? register_irq_proc+0x92/0xaa
[<ffffffff8025c2c8>] ? init_irq_proc+0x57/0x69
[<ffffffff807fc85f>] ? kernel_init+0x116/0x169
[<ffffffff8020cc79>] ? child_rip+0xa/0x11
[<ffffffff807fc749>] ? kernel_init+0x0/0x169
[<ffffffff8020cc6f>] ? child_rip+0x0/0x11
Code: 05 c5 83 36 00 48 c7 c2 48 5d 86 80 48 8b 04 d8 48 8b 40 08 48 8b 34 02 48\
RIP [<ffffffff80486361>] cpufreq_stats_update+0x4a/0x5f
RSP <ffff88006fb83b20>
CR2: ffff88086e7528b8
---[ end trace 0678bac75e67a2f7 ]---
Kernel panic - not syncing: Attempted to kill init!
In short, aftereffect of the wrong P-state is that
cpufreq_stats_update() uses "-1" as index for some array in
cpufreq_stats_update (unsigned int cpu)
{
...
if (stat->time_in_state)
stat->time_in_state[stat->last_index] =
cputime64_add(stat->time_in_state[stat->last_index],
cputime_sub(cur_time, stat->last_time));
...
}
Fortunately, the wrong P-state value is returned only if the core is
in P-state 0. This fix solves the problem by detecting the
out-of-range P-state, ignoring it, and using "0" instead.
Cc: Mark Langsdorf <mark.langsdorf at amd.com>
Signed-off-by: Andreas Herrmann <andreas.herrmann3 at amd.com>
Signed-off-by: Dave Jones <davej at redhat.com>
commit 121fe86bdf062af3fed1e998c08c3c272ae6dc99
Author: Robin Getz <rgetz at blackfin.uclinux.org>
Date: Fri Oct 17 01:36:43 2008 +0800
[CPUFREQ] Documentation: Add Blackfin to list of supported processors
Signed-off-by: Robin Getz <rgetz at blackfin.uclinux.org>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Signed-off-by: Dave Jones <davej at redhat.com>
commit de90add30e79261c3b5be68bb0f22d2ef98e8113
Author: Markus Metzger <markus.t.metzger at intel.com>
Date: Tue Nov 25 08:52:56 2008 +0100
x86, bts: fix wrmsr and spinlock over kmalloc
Impact: fix sleeping-with-spinlock-held bugs/crashes
- Turn a wrmsr to write the DS_AREA MSR into a wrmsrl.
- Use irqsave variants of spinlocks.
- Do not allocate memory while holding spinlocks.
Reported-by: Stephane Eranian <eranian at googlemail.com>
Reported-by: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Markus Metzger <markus.t.metzger at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit c4858ffc8f2dc850cb1f609c679b1ac1ad36ef0c
Author: Markus Metzger <markus.t.metzger at intel.com>
Date: Tue Nov 25 08:49:06 2008 +0100
x86, pebs: fix PEBS record size configuration
Impact: fix DS hw enablement on 64-bit x86
Fix the PEBS record size in the DS configuration.
Reported-by: Stephane Eranian <eranian at googlemail.com>
Signed-off-by: Markus Metzger <markus.t.metzger at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit e5e8ca633bbe972eff6f84e064a63c0c08ed6c3d
Author: Markus Metzger <markus.t.metzger at intel.com>
Date: Tue Nov 25 08:47:19 2008 +0100
x86, bts: turn macro into static inline function
Impact: cleanup
Replace a macro with a static inline function.
Signed-off-by: Markus Metzger <markus.t.metzger at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 292c669cd7087a090d6420e223eb1072f3e3c50b
Author: Markus Metzger <markus.t.metzger at intel.com>
Date: Tue Nov 25 08:45:13 2008 +0100
x86, bts: exclude ds.c from build when disabled
Impact: cleanup
Move the CONFIG guard from the .c file into the makefile.
Reported-by: Andi Kleen <andi-suse at firstfloor.org>
Signed-off-by: Markus Metzger <markus.t.metzger at intel.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit b6283534a3e057f8268ca5448305900f74d12608
Merge: c879c634c928223765cf50103ddaf32f2a55fed0 661cd8fb5210af78f0763071642e0764a10389a6
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Nov 25 17:21:32 2008 +0100
Merge branch 'topic/fix/hda' into for-linus
commit eff79aee91dd07e944df65fa448c8baeee7709d8
Author: Julia Lawall <julia at diku.dk>
Date: Tue Nov 25 14:13:03 2008 +0100
arch/x86/kernel/pci-calgary_64.c: change simple_strtol to simple_strtoul
Impact: fix theoretical option string parsing overflow
Since bridge is unsigned, it would seem better to use simple_strtoul that
simple_strtol.
A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r2@
long e;
position p;
@@
e = simple_strtol at p(...)
@@
position p != r2.p;
type T;
T e;
@@
e =
- simple_strtol at p
+ simple_strtoul
(...)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Cc: muli at il.ibm.com
Cc: jdmason at kudzu.us
Cc: discuss at x86-64.org
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 5cf02b7bafddb6c3c16ddfb23d3ce187f70528ba
Author: Steven Rostedt <rostedt at goodmis.org>
Date: Tue Nov 25 00:42:37 2008 -0500
x86: use limited register constraint for setnz
Impact: build fix with certain compilers
GCC can decide to use %dil when "r" is used, which is not valid for
setnz.
This bug was brought out by Stephen Rothwell's merging of the
branch tracer into linux-next.
[ Thanks to Uros Bizjak for recommending 'q' over 'Q' ]
Signed-off-by: Steven Rostedt <srostedt at redhat.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 661cd8fb5210af78f0763071642e0764a10389a6
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Nov 25 15:18:29 2008 +0100
ALSA: hda - Check model for Dell 92HD73xx laptops
Check the model type instead of PCI SSID for detection of the mic types
on Dell laptops with IDT 92HD73xx codecs. In this way, a new laptop
can be tested via model module option.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit c65574abad288d7123bd49e7906fa53b7e420239
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri Nov 21 18:01:44 2008 +0100
ALSA: hda - mark Dell studio 1535 quirk
Fixed the quirk string for Dell studio 1535 (the product name wasn't
published at the time the patch was made).
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 95026623da32848bc93fbfb472dc8737487df450
Author: Takashi Iwai <tiwai at suse.de>
Date: Mon Nov 24 07:51:11 2008 +0100
ALSA: hda - No 'Headphone as Line-out' swich without line-outs
STAC/IDT driver creates "Headphone as Line-Out" switch even if there
is no line-out pins on the machine. For devices only with headpohnes
and speaker-outs, this switch shouldn't be created.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit f73d35853e9263c7c404f0d6c0fe3d83fc6fd5c0
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Nov 25 08:21:51 2008 +0100
ALSA: hda - Fix AFG power management on IDT 92HD* codecs
The AFG pin power-mapping isn't properly set for the fixed I/O pins
on IDT 92HD* codecs. This resulted in the low power mode after the
boot until any jack detection is executed, thus no output from the
speaker.
This patch fixes the power mapping for the fixed pins, and also fixes
the GPIO bits and digital I/O pin settings properly in stac92xx_ini().
Reference: Novell bnc#446025
https://bugzilla.novell.com/show_bug.cgi?id=446025
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 9e97697666d0e7494946cfb639f6a9faacd5f1b0
Author: Takashi Iwai <tiwai at suse.de>
Date: Tue Nov 25 08:17:20 2008 +0100
ALSA: hda - Fix caching of SPDIF status bits
SPDIF status bits controls are written via snd_hda_codec_write()
without caching. This causes a regression at resume that the bits
are lost.
Simply replacing it with the cached version fixes the problem.
Reference:
http://lkml.org/lkml/2008/11/24/324
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 7953031da4200323ab5d85bd514054ca4ba9d225
Author: Tony Lindgren <tony at atomide.com>
Date: Mon Nov 24 18:11:16 2008 -0800
ARM: OMAP: Remove broken LCD driver for SX1
Recently the omap McBSP code was cleaned up to get rid of
direct McBSP register tinkering by the drivers. Looks like
lcd_sx1.c never got converted, and now it breaks builds.
It seems the lcd_sx1.c driver is attempting SPI mode, but
doing it in a different way compared to omap_mcbsp_set_spi_mode().
Remove the broken driver, patches welcome to add it back when
done properly by patching both mcbsp.c and lcd_sx1.c.
Cc: Vovan888 at gmail.com
Cc: linux-fbdev-devel at lists.sourceforge.net
Signed-off-by: Tony Lindgren <tony at atomide.com>
commit 52440211dcdc52c0b757f8b34d122e11b12cdd50
Author: Keith Packard <keithp at keithp.com>
Date: Tue Nov 18 09:30:25 2008 -0800
drm: move drm vblank initialization/cleanup to driver load/unload
drm vblank initialization keeps track of the changes in driver-supplied
frame counts across vt switch and mode setting, but only if you let it by
not tearing down the drm vblank structure.
Signed-off-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 6133047aa64d2fd5b3b79dff74f696ded45615b2
Author: Keith Packard <keithp at keithp.com>
Date: Thu Nov 20 23:14:48 2008 -0800
drm/i915: execbuffer pins objects, no need to ensure they're still in the GTT
Before we had the notion of pinning objects, we had a kludge around to make
sure all of the objects were still resident in the GTT before we committed
to executing a batch buffer. We don't need this any longer, and it sticks an
error return in the middle of object domain computations that must be
associated with a subsequent flush/invalidate emmission into the ring.
Signed-off-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 05eff845a28499762075d3a72e238a31f4d2407c
Author: Keith Packard <keithp at keithp.com>
Date: Wed Nov 19 14:03:05 2008 -0800
drm/i915: Always read pipestat in irq_handler
Because we write pipestat before iir, it's possible that a pipestat
interrupt will occur between the pipestat write and the iir write. This
leaves pipestat with an interrupt status not visible in iir. This may cause
an interrupt flood as we never clear the pipestat event.
Signed-off-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 2678d9d6964b29ecd1975870c7a850242b29bc5c
Author: Keith Packard <keithp at keithp.com>
Date: Thu Nov 20 22:54:54 2008 -0800
drm/i915: Subtract total pinned bytes from available aperture size
The old code was wandering through the active list looking for pinned
buffers; there may be other pinned buffers around. Fortunately, we keep a
count of the total amount of pinned memory and can use that instead.
Signed-off-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 28dfe52a6e8a1495067c4331358700a170d0ee86
Author: Eric Anholt <eric at anholt.net>
Date: Thu Nov 13 15:00:55 2008 -0800
drm/i915: Avoid BUG_ONs on VT switch with a wedged chipset.
Instead, just warn that bad things are happening and do our best to clean up
the mess without the GPU's help.
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit cdfbc41f6d602fc0105fb2b4e0645cc1aa274c12
Author: Eric Anholt <eric at anholt.net>
Date: Tue Nov 4 15:50:30 2008 -0800
drm/i915: Remove IMR masking during interrupt handler, and restart it if needed.
The IMR masking was a technique recommended for avoiding getting stuck with
no interrupts generated again in MSI mode. It kept new IIR bits from getting
set between the IIR read and the IIR write, which would have otherwise
prevented an MSI from ever getting generated again. However, this caused a
problem for vblank as the IMR mask would keep the pipe event interrupt from
getting reflected in IIR, even after the IMR mask was brought back down.
Instead, just check the state of IIR after we ack the interrupts we're going
to handle, and restart if we didn't get IIR all the way to zero.
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 7c463586427bbbad726ba561bae4ba5acada2481
Author: Keith Packard <keithp at keithp.com>
Date: Tue Nov 4 02:03:27 2008 -0800
drm/i915: Manage PIPESTAT to control vblank interrupts instead of IMR.
The pipestat fields affect reporting of all vblank-related interrupts, so we
have to reset them during the irq_handler, and while enabling vblank
interrupts. Otherwise, if a pipe status field had been set to non-zero
before enabling reporting, we would never see an interrupt again.
This patch adds i915_enable_pipestat and i915_disable_pipestat to abstract
out the steps needed to change the reported interrupts.
Signed-off-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
commit 8442c87d2f6c73cdc9a391e4dd9390523d242bda
Author: Arjan van de Ven <arjan at infradead.org>
Date: Sun Nov 23 22:35:57 2008 -0500
Input: replace spin_lock_bh with spin_lock_irqsave in ml_ff_playback
ml_ff_playback() uses spin_(un)lock_bh. However this function is
called with interrupts disabled from erase_effect() in
drivers/input/ff-core.c:196.
This is not permitted, and will result in a WARN_ON in the bottom
half handling code. This patch changes this function to just use
spin_lock_irqsave() instead, solving the problem and simplifying
the locking logic.
This was reported as entry #106559 in kerneloops.org
Reported-by: kerneloops.org
Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 8ec2e24356e63dc298c6040557faf396410907ac
Author: David Daney <ddaney at caviumnetworks.com>
Date: Thu Nov 20 17:26:36 2008 -0800
MIPS: Make BUG() __noreturn.
Often we do things like put BUG() in the default clause of a case
statement. Since it was not declared __noreturn, this could sometimes
lead to bogus compiler warnings that variables were used
uninitialized.
There is a small problem in that we have to put a magic while(1); loop to
fool GCC into really thinking it is noreturn. This makes the new
BUG() function 3 instructions long instead of just 1, but I think it
is worth it as it is now unnecessary to do extra work to silence the
'used uninitialized' warnings.
I also re-wrote BUG_ON so that if it is given a constant condition, it
just does BUG() instead of loading a constant value in to a register
and testing it.
Signed-off-by: David Daney <ddaney at caviumnetworks.com>
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
commit 50f3beb50abe0cc0228363af804e50e710b3e5b0
Author: Mauro Carvalho Chehab <mchehab at redhat.com>
Date: Mon Nov 24 08:45:57 2008 -0300
V4L/DVB (9742): em28xx-alsa: implement another locking schema
Instead of using a spinlock, it is better to call the proper pcm stream
locking schema.
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit 7a8f4ccfd572a11f609439dc6a75165b441641bc
Author: Michael Krufky <mkrufky at linuxtv.org>
Date: Fri Nov 21 17:14:37 2008 -0300
V4L/DVB (9732): sms1xxx: use new firmware for Hauppauge WinTV MiniStick
New firmware image brings enhanced tuning performance.
Firmware is available for download at the following location:
http://www.steventoth.net/linux/sms1xxx
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit e07a1d8ab20a059fefbfd1558db43701bca560d7
Author: Jean-Francois Moine <moinejf at free.fr>
Date: Wed Nov 19 06:37:53 2008 -0300
V4L/DVB (9691): gspca: Move the video device to a separate area.
The video device was part of the gspca device. On device disconnection
while streaming, the device structure is freed at close time.
In this case, the remaining close job on the video device run out of
allocated memory.
Signed-off-by: Jean-Francois Moine <moinejf at free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit 5c4fa002b1c7b40f65fa911ae17a823ec9e26ab2
Author: Jean-Francois Moine <moinejf at free.fr>
Date: Tue Nov 18 15:52:31 2008 -0300
V4L/DVB (9690): gspca: Lock the subdrivers via module_get/put.
The previous subdriver protection against rmmod was done via the
file operations table in the device descriptor. On device disconnection
while streaming, the device structure was freed at close time, and the
module_put still used the module name in the freed area.
Now, explicit module get/put are done on open and close.
Signed-off-by: Jean-Francois Moine <moinejf at free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit 98522a7be97f2b23451342e36c39f412f0461e24
Author: Jean-Francois Moine <moinejf at free.fr>
Date: Tue Nov 18 06:33:08 2008 -0300
V4L/DVB (9689): gspca: Memory leak when disconnect while streaming.
As a side effect, the sd routine stop0 is called on disconnect.
This permits the subdriver to free its resources.
Signed-off-by: Jean-Francois Moine <moinejf at free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit 3f9b5d4dda6d85aab33fef32e8351ddc34c81fb4
Merge: be542fa56b1b5b269a70b4df219d0cbd871f16d2 606572634c3faa5b32a8fc430266e6e9d78d2179
Author: Paul Mackerras <paulus at samba.org>
Date: Mon Nov 24 11:54:08 2008 +1100
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs into merge
commit be542fa56b1b5b269a70b4df219d0cbd871f16d2
Merge: 11bac8a026dd38380b52a914ec9bf65fb2ad13e2 6612d9b0b8208c2ade3a16b8302a271ec81d45f6
Author: Paul Mackerras <paulus at samba.org>
Date: Mon Nov 24 11:53:58 2008 +1100
Merge branch 'merge' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
commit 11bac8a026dd38380b52a914ec9bf65fb2ad13e2
Merge: e871809cccc11aaa072afaf746f8fd946d2d9cac c8d698849e135780738c2cb08f07f06eda982a8c
Author: Paul Mackerras <paulus at samba.org>
Date: Mon Nov 24 11:53:44 2008 +1100
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
commit fb91ee6cf5b8be5360acec577458e29ec7e97e5e
Author: Pekka Paalanen <pq at iki.fi>
Date: Sun Nov 23 21:24:59 2008 +0200
tracing, doc: update mmiotrace documentation
Impact: update documentation
Update to reflect the current state of the tracing framework:
- "none" tracer has been replaced by "nop" tracer
- tracing_enabled must be toggled when changing buffer size
Signed-off-by: Pekka Paalanen <pq at iki.fi>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 7ee1768ddb3075ae3a0801cc2d0ea4195530a7db
Author: Pekka Paalanen <pq at iki.fi>
Date: Sun Nov 23 21:24:30 2008 +0200
x86, mmiotrace: fix buffer overrun detection
Impact: fix mmiotrace overrun tracing
When ftrace framework moved to use the ring buffer facility, the buffer
overrun detection was broken after 2.6.27 by commit
| commit 3928a8a2d98081d1bc3c0a84a2d70e29b90ecf1c
| Author: Steven Rostedt <rostedt at goodmis.org>
| Date: Mon Sep 29 23:02:41 2008 -0400
|
| ftrace: make work with new ring buffer
|
| This patch ports ftrace over to the new ring buffer.
The detection is now fixed by using the ring buffer API.
When mmiotrace detects a buffer overrun, it will report the number of
lost events. People reading an mmiotrace log must know if something was
missed, otherwise the data may not make sense.
Signed-off-by: Pekka Paalanen <pq at iki.fi>
Acked-by: Steven Rostedt <rostedt at goodmis.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 47fd6f7c94e15eb5f97dd1cbb0427a46b03c8185
Author: Jaya Kumar <jayakumar.lkml at gmail.com>
Date: Tue Nov 18 02:32:36 2008 +0100
[ARM] 5335/1: pxa25x_udc: Fix is_vbus_present to return 1 or 0
the use of is_blah() suggests a 1 or 0 return. This assumption is made in
pxa25x_udc code such as:
dev->vbus = is_vbus_present();
where dev->vbus is a bitfield. This fix allows pxa25x_udc_probe to correctly
detect vbus. Other changes were to make its use consistent in the rest of
the code.
Signed-off-by: Jaya Kumar <jayakumar.lkml at gmail.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 86bbc2c235e500957b213e7e64ce2e0ccb8bc131
Author: Ian Campbell <Ian.Campbell at citrix.com>
Date: Fri Nov 21 10:21:33 2008 +0000
xen: pin correct PGD on suspend
Impact: fix Xen guest boot failure
commit eefb47f6a1e855653d275cb90592a3587ea93a09 ("xen: use
spin_lock_nest_lock when pinning a pagetable") changed xen_pgd_walk to
walk over mm->pgd rather than taking pgd as an argument.
This breaks xen_mm_(un)pin_all() because it makes init_mm.pgd readonly
instead of the pgd we are interested in and therefore the pin subsequently
fails.
(XEN) mm.c:2280:d15 Bad type (saw 00000000e8000001 != exp 0000000060000000) for mfn bc464 (pfn 21ca7)
(XEN) mm.c:2665:d15 Error while pinning mfn bc464
[ 14.586913] 1 multicall(s) failed: cpu 0
[ 14.586926] Pid: 14, comm: kstop/0 Not tainted 2.6.28-rc5-x86_32p-xenU-00172-gee2f6cc #200
[ 14.586940] Call Trace:
[ 14.586955] [<c030c17a>] ? printk+0x18/0x1e
[ 14.586972] [<c0103df3>] xen_mc_flush+0x163/0x1d0
[ 14.586986] [<c0104bc1>] __xen_pgd_pin+0xa1/0x110
[ 14.587000] [<c015a330>] ? stop_cpu+0x0/0xf0
[ 14.587015] [<c0104d7b>] xen_mm_pin_all+0x4b/0x70
[ 14.587029] [<c022bcb9>] xen_suspend+0x39/0xe0
[ 14.587042] [<c015a330>] ? stop_cpu+0x0/0xf0
[ 14.587054] [<c015a3cd>] stop_cpu+0x9d/0xf0
[ 14.587067] [<c01417cd>] run_workqueue+0x8d/0x150
[ 14.587080] [<c030e4b3>] ? _spin_unlock_irqrestore+0x23/0x40
[ 14.587094] [<c014558a>] ? prepare_to_wait+0x3a/0x70
[ 14.587107] [<c0141918>] worker_thread+0x88/0xf0
[ 14.587120] [<c01453c0>] ? autoremove_wake_function+0x0/0x50
[ 14.587133] [<c0141890>] ? worker_thread+0x0/0xf0
[ 14.587146] [<c014509c>] kthread+0x3c/0x70
[ 14.587157] [<c0145060>] ? kthread+0x0/0x70
[ 14.587170] [<c0109d1b>] kernel_thread_helper+0x7/0x10
[ 14.587181] call 1/3: op=14 arg=[c0415000] result=0
[ 14.587192] call 2/3: op=14 arg=[e1ca2000] result=0
[ 14.587204] call 3/3: op=26 arg=[c1808860] result=-22
Signed-off-by: Ian Campbell <ian.campbell at citrix.com>
Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 3d994e107694381f5b8b2f5cd9fdc4fcf04a5b79
Merge: a1967d64414dab500e86cbbddf8eae6ad2047903 a4a16beadea041ab601e65b264b568e8b6b4f68d
Author: Ingo Molnar <mingo at elte.hu>
Date: Sun Nov 23 12:16:57 2008 +0100
Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into x86/urgent
commit fde5be353e872fe6088d2b1951e56cdfda2042ff
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Sun Nov 23 12:03:20 2008 +0100
HID: remove setup mutex, fix possible deadlock
It causes recursive locking warning and is unneeded after
introduction of STARTED flag.
* Resume vs. stop is effectively solved by DISCONNECT flag.
* No problem in suspend vs. start -- urb is submitted even after open
which is possible after connect which is called after start.
* Resume vs. start solved by STARTED flag.
* Suspend vs. stop -- no problem in killing urb and timer twice.
Reported-by: Alan Stern <stern at rowland.harvard.edu>
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit a1967d64414dab500e86cbbddf8eae6ad2047903
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Fri Nov 21 11:16:48 2008 -0800
x86: revert irq number limitation
Impact: fix MSIx not enough irq numbers available regression
The manual revert of the sparse_irq patches missed to bring the number
of possible irqs back to the .27 status. This resulted in a regression
when two multichannel network cards were placed in a system with only
one IO_APIC - causing the networking driver to not have the right
IRQ and the device not coming up.
Remove the dynamic allocation logic leftovers and simply return
NR_IRQS in probe_nr_irqs() for now.
Fixes: http://lkml.org/lkml/2008/11/19/354
Reported-by: Jesper Dangaard Brouer <hawk at diku.dk>
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Tested-by: Jesper Dangaard Brouer <hawk at diku.dk>
Acked-by: Yinghai Lu <yinghai at kernel.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 2ed1cdcf9a83205d1343f29b630abff232eaa72c
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Fri Nov 21 16:59:57 2008 -0800
irq.h: fix missing/extra kernel-doc
Impact: fix kernel-doc build
Fix missing & excess irq.h kernel-doc:
Warning(include/linux/irq.h:182): No description found for parameter 'irq'
Warning(include/linux/irq.h:182): Excess struct/union/enum/typedef member 'affinity_entry' description in 'irq_desc'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 9f1441644213e5f6faa150206399fe511eba2eb6
Merge: 3ff68a6a106c362a6811d3e51bced58e6fc87de7 13d428afc007fcfcd6deeb215618f54cf9c0cae6
Author: Ingo Molnar <mingo at elte.hu>
Date: Sun Nov 23 10:52:33 2008 +0100
Merge commit 'v2.6.28-rc6' into irq/urgent
commit 844c6f6a36984c5fe1bcc2d68a88f2ed212d1eef
Author: Robert Jarzmik <robert.jarzmik at free.fr>
Date: Mon Nov 17 20:29:04 2008 +0100
[ARM] pxa/MioA701: bluetooth resume fix
The G3IPL expects the value at RAM address 0xa020b020 to be
exactly 1 to setup the bluetooth GPIOs properly. The actual
code got a value from gpio_get_value() which was not 1, but
a "not equal to 0" integer.
Signed-off-by: Robert Jarzmik <robert.jarzmik at free.fr>
Acked-by: Russell King <rmk+kernel at arm.linux.org.uk>
Signed-off-by: Eric Miao <eric.miao at marvell.com>
commit 999f6338780fa0577b6581941c697c868d1ec2d3
Author: Robert Jarzmik <robert.jarzmik at free.fr>
Date: Mon Nov 17 20:29:03 2008 +0100
[ARM] pxa/MioA701: fix memory corruption.
In the resume bootstrap, the early disable address is wrong.
Fix it to RAM address 0xa020b000 instead of 0xa0200000, and
make it consistent with RESUME_ENABLE_ADDR in mioa701.c.
Signed-off-by: Robert Jarzmik <robert.jarzmik at free.fr>
Acked-by: Russell King <rmk+kernel at arm.linux.org.uk>
Signed-off-by: Eric Miao <eric.miao at marvell.com>
commit 57550b27ff5a13b00370fbfa34f2471c3456a41d
Merge: bfe085f62f98a49e1b864e4950389c7205174e4f 13d428afc007fcfcd6deeb215618f54cf9c0cae6
Author: Ingo Molnar <mingo at elte.hu>
Date: Fri Nov 21 20:55:09 2008 +0100
Merge commit 'v2.6.28-rc6' into x86/urgent
commit b0788caf7af773b6c2374590dabd3a205f0918a8
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Fri Nov 21 15:57:32 2008 +0800
lockdep: consistent alignement for lockdep info
Impact: prettify /proc/lockdep_info
Just feel odd that not all lines of lockdep info are aligned.
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Acked-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 522a110b42b306d696cf84e34c677ed0e7080194
Author: Liming Wang <liming.wang at windriver.com>
Date: Fri Nov 21 11:00:18 2008 +0800
function tracing: fix wrong position computing of stack_trace
Impact: make output of stack_trace complete if buffer overruns
When read buffer overruns, the output of stack_trace isn't complete.
When printing records with seq_printf in t_show, if the read buffer
has overruned by the current record, then this record won't be
printed to user space through read buffer, it will just be dropped in
this printing.
When next printing, t_start should return the "*pos"th record, which
is the one dropped by previous printing, but it just returns
(m->private + *pos)th record.
Here we use a more sane method to implement seq_operations which can
be found in kernel code. Thus we needn't initialize m->private.
About testing, it's not easy to overrun read buffer, but we can use
seq_printf to print more padding bytes in t_show, then it's easy to
check whether or not records are lost.
This commit has been tested on both condition of overrun and non
overrun.
Signed-off-by: Liming Wang <liming.wang at windriver.com>
Acked-by: Steven Rostedt <rostedt at goodmis.org>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit c879c634c928223765cf50103ddaf32f2a55fed0
Merge: ef71b1b87521ff93ed77b3e8f3e149afb392761c b0fc5e043401df4cd243352f1030c4d23e767347 a39c4ad1089be34d8dc66e926e93a52c44993a0a
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri Nov 21 08:39:36 2008 +0100
Merge branches 'topic/fix/hda' and 'topic/fix/sound-core' into for-linus
commit b0fc5e043401df4cd243352f1030c4d23e767347
Author: Takashi Iwai <tiwai at suse.de>
Date: Fri Nov 21 08:37:03 2008 +0100
ALSA: hda - Add a quirk for Dell Studio 15
Added the matching model=dell-m6 for Dell Studio 15 laptop.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 3a7abfd2ba26479615b81ac5e90d0122ef7f9fe0
Author: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Thu Nov 20 21:21:43 2008 -0500
ALSA: hda: Add STAC_DELL_M4_3 quirk
Added STAC_DELL_M4_3 quirk for Dell systems, also reorganized the
board config switch to assign number of digital muxes, microphones,
and SPDIF muxes via the PCI quirk defined.
Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit a39c4ad1089be34d8dc66e926e93a52c44993a0a
Author: Hannes Eder <hannes at hanneseder.net>
Date: Thu Nov 20 21:25:25 2008 +0100
sound/sound_core: Fix sparse warnings
Fix the following sparse warnings:
sound/sound_core.c:460:2: warning: returning void-valued expression
sound/sound_core.c:477:2: warning: returning void-valued expression
sound/sound_core.c:510:5: warning: symbol 'soundcore_open' was not
declared. Should it be static?
Signed-off-by: Hannes Eder <hannes at hanneseder.net>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 606572634c3faa5b32a8fc430266e6e9d78d2179
Author: Jeremy Kerr <jk at ozlabs.org>
Date: Tue Nov 11 10:22:22 2008 +1100
powerpc/spufs: Fix spinning in spufs_ps_fault on signal
Currently, we can end up in an infinite loop if we get a signal
while the kernel has faulted in spufs_ps_fault. Eg:
alarm(1);
write(fd, some_spu_psmap_register_address, 4);
- the write's copy_from_user will fault on the ps mapping, and
signal_pending will be non-zero. Because returning from the fault
handler will never clear TIF_SIGPENDING, so we'll just keep faulting,
resulting in an unkillable process using 100% of CPU.
This change returns VM_FAULT_SIGBUS if there's a fatal signal pending,
letting us escape the loop.
Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
commit 818a557eeb9c16a9a2dc93df348b0ff68fbc487f
Author: Mauro Carvalho Chehab <mchehab at redhat.com>
Date: Thu Nov 20 10:30:26 2008 -0300
V4L/DVB (9668): em28xx: fix a race condition with hald
Newer versions of hald tries to open it to call QUERYCAP.
Due to the lack of a proper locking, it is possible to open the device
before it finishes initialization.
This patch adds a lock to avoid this risk, and to protect the list of
em28xx devices.
While here, remove the uneeded BKL lock.
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit cce257109f534b4954a5d04aa4ba6905f4682f93
Author: Jose Alberto Reguero <jareguero at telefonica.net>
Date: Thu Nov 13 14:14:18 2008 -0300
V4L/DVB (9664): af9015: don't reconnect device in USB-bus
Don't reconnect device in the USB-bus. Reconnect command was not
executed every time by device firmware and that causes harm.
Reconnection is not needed so remove it.
Signed-off-by: Jose Alberto Reguero <jareguero at telefonica.net>
Signed-off-by: Antti Palosaari <crope at iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit f2a2e4910502e866833732f31ee697d15b3e56fd
Author: Mauro Carvalho Chehab <mchehab at redhat.com>
Date: Wed Nov 19 06:17:44 2008 -0300
V4L/DVB (9647): em28xx: void having two concurrent control URB's
Now that we have a polling task for IR, there's a race condition, since
IR can be polling while other operations are being doing. Also, we are
now sharing the same urb_buf for both read and write control urb
operations. So, we need a mutex.
Thanks to Davin Heitmueller <devin.heitmueller at gmail.com> for warning me.
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit c4a98793a63c423c9e1af51822325969e23c16d4
Author: Mauro Carvalho Chehab <mchehab at redhat.com>
Date: Tue Nov 18 14:51:08 2008 -0300
V4L/DVB (9646): em28xx: avoid allocating/dealocating memory on every control urb
Before this patch, every register setup on em28xx were dynamically
allocating a temporary buffer for control URB's to be handled.
To avoid this ping-pong, use, instead a pre-allocated buffer.
Also, be sure that read control URB's also use the buffer, instead of
relying on a stack buffer.
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit 625ff1679456d8adb9af0c980394ea3954e727a8
Author: Mauro Carvalho Chehab <mchehab at redhat.com>
Date: Tue Nov 18 10:23:19 2008 -0300
V4L/DVB (9645): em28xx: Avoid memory leaks if registration fails
em28xx_init_dev() has some error conditions that are not properly
de-allocating dev var, nor freeing the device number for a future usage.
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit 0253fdcd8aec2f954c2950a7454c0a2f3207e9a1
Author: Matthew Ranostay <mranostay at embeddedalley.com>
Date: Sun Nov 16 11:42:34 2008 -0500
ALSA: hda: STAC_DELL_M6 EAPD
Add support for EAPD on system suspend and disabling EAPD on headphone jack
detection for STAC_DELL_M6 laptops.
This patch fixes the regressions, the silent output on HP of some Dell
laptops (see Novell bnc#446025):
https://bugzilla.novell.com/show_bug.cgi?id=446025
Signed-off-by: Matthew Ranostay <mranostay at embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit bfe085f62f98a49e1b864e4950389c7205174e4f
Author: Rakib Mullick <rakib.mullick at gmail.com>
Date: Thu Nov 20 19:12:50 2008 +0600
x86: fixing __cpuinit/__init tangle, xsave_cntxt_init()
Annotate xsave_cntxt_init() as "can be called outside of __init".
Signed-off-by: Rakib Mullick <rakib.mullick at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 9bc646f163b136684390081262fab0fd8f5343ca
Author: Rakib Mullick <rakib.mullick at gmail.com>
Date: Thu Nov 20 19:08:45 2008 +0600
x86: fix __cpuinit/__init tangle in init_thread_xstate()
Impact: fix incorrect __init annotation
This patch removes the following section mismatch warning. A patch set
was send previously (http://lkml.org/lkml/2008/11/10/407). But
introduce some other problem, reported by Rufus
(http://lkml.org/lkml/2008/11/11/46). Then Ingo Molnar suggest that,
it's best to remove __init from xsave_cntxt_init(void). Which is the
second patch in this series. Now, this one removes the following
warning.
WARNING: arch/x86/kernel/built-in.o(.cpuinit.text+0x2237): Section
mismatch in reference from the function cpu_init() to the function
.init.text:init_thread_xstate()
The function __cpuinit cpu_init() references
a function __init init_thread_xstate().
If init_thread_xstate is only used by cpu_init then
annotate init_thread_xstate with a matching annotation.
Signed-off-by: Rakib Mullick <rakib.mullick at gmail.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 578f3a35fecabff49bad808c5301313f785b5462
Author: Jiri Kosina <jkosina at suse.cz>
Date: Thu Nov 20 15:55:38 2008 +0100
HID: add USB ID for another dual gameron adapter
0x0810/0x0002 needs the very same handling as 0x0001.
Reported-by: Steve Conklin <sconklin at canonical.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit 06d2148ed3b3fa997fa5a848f6405709c464b3ba
Author: Jiri Kosina <jkosina at suse.cz>
Date: Thu Nov 20 11:22:17 2008 +0100
HID: unignore mouse on unibody macbooks
In commit a96d6ef34, the mouse interfaces on the unibody macbooks were
put into hid mouse ignore list. This was a little bit too premature
though, as the corresponding bcm5974 changes are scheduled for 2.6.29.
Remove these devices from the ignore list for now, in order to provide at
least basic functionality with the HID driver.
Will be reintroduced in 2.6.29
Reported-by: Henrik Rydberg <rydberg at euromail.se>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit 5f4ba04ffd8fc9f6b15b92270ef0517ae52dcf3a
Author: Dmitry Torokhov <dmitry.torokhov at gmail.com>
Date: Fri Nov 14 13:32:42 2008 -0500
Input: i8042 - add Compal Hel80 laptop to nomux blacklist
Reported-by: Jaime Cura <jimyx17 at gmail.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit e871809cccc11aaa072afaf746f8fd946d2d9cac
Author: Michael Barkowski <michael.barkowski at freescale.com>
Date: Thu Nov 13 10:18:28 2008 -0500
powerpc/mpc832x_rdb: fix swapped ethernet ids
ethernet0 (called FSL UEC0 in U-Boot) should be enet1 (UCC3/eth1), and
ethernet1 should be enet0 (UCC2/eth0), to be consistent with U-Boot so
that the interfaces do not swap addresses when control passes from
U-Boot to the kernel.
Signed-off-by: Michael Barkowski <michael.barkowski at freescale.com>
Acked-by: Kim Phillips <kim.phillips at freescale.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit 06597aa90a75621639dcaaf5fc07bcb01f752d45
Author: Martyn Welch <martyn.welch at gefanuc.com>
Date: Tue Nov 18 10:55:45 2008 +0000
powerpc: Use generic PHY driver for Marvell 88E1111 PHY on GE Fanuc SBC610
The Marvell PHY driver is currently being used for the 88E1111 on the
SBC610. This driver is causing the link to run in 10/Half mode, the generic
PHY driver is correctly configuring the PHY as 1000/Full.
Edit default config to use generic PHY driver.
Signed-off-by: Martyn Welch <martyn.welch at gefanuc.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit f464ff581c247d82fcc0e7ef40c1ca6df9739068
Author: Trent Piepho <tpiepho at freescale.com>
Date: Wed Nov 19 10:40:55 2008 -0800
powerpc/85xx: L2 cache size wrong in 8572DS dts
It's 1MB, not 512KB. Newer U-Boots will fix this entry, but that's no
reason to have the wrong value in the dts.
Signed-off-by: Trent Piepho <tpiepho at freescale.com>
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
commit a4a16beadea041ab601e65b264b568e8b6b4f68d
Author: Eric Dumazet <dada1 at cosmosbay.com>
Date: Mon Nov 10 09:05:37 2008 +0100
oprofile: fix an overflow in ppro code
reset_value was changed from long to u64 in commit
b99170288421c79f0c2efa8b33e26e65f4bb7fb8 (oprofile: Implement Intel
architectural perfmon support)
But dynamic allocation of this array use a wrong type (long instead of
u64)
Cc: Andi Kleen <ak at linux.intel.com>
Signed-off-by: Eric Dumazet <dada1 at cosmosbay.com>
Signed-off-by: Robert Richter <robert.richter at amd.com>
commit 99afb989b05b9fb1c7b3831ce4b7a000b214acdb
Author: Devin Heitmueller <devin.heitmueller at gmail.com>
Date: Sat Nov 15 07:13:07 2008 -0300
V4L/DVB (9639): Make dib0700 remote control support work with firmware v1.20
The format for reading the IR controller changed in firmware 1.20. It now
provides the events on bulk endpoint 1 instead of using a control request.
Support the new format, providing backward compatibility for users who might
be using older firmware.
Thanks to Patrick Boettcher <patrick.boettcher at desy.de> for providing the
required information on how the version 1.20 firmware works.
Signed-off-by: Devin Heitmueller <devin.heitmueller at gmail.com>
Signed-off-by: Patrick Boettcher <pb at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit deaf53e3c8e717169669ee6c2594b5c33d1af93b
Author: Harvey Harrison <harvey.harrison at gmail.com>
Date: Sat Nov 15 01:10:14 2008 -0300
V4L/DVB (9635): v4l: s2255drv fix firmware test on big-endian
Noticed by sparse:
drivers/media/video/s2255drv.c:2531:6: warning: restricted __le32 degrades to integer
Cc: Dean Anderson <dean at sensoray.com>
Signed-off-by: Harvey Harrison <harvey.harrison at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit 41286d972530b7a47acb48376d714b6b121a6c22
Author: Devin Heitmueller <devin.heitmueller at gmail.com>
Date: Sun Nov 16 00:44:52 2008 -0300
V4L/DVB (9634): Make sure the i2c gate is open before powering down tuner
It is not safe to assume that the i2c gate will be open before issuing the
command to power down the tuner. In fact, many demods only open the gate
long enough to issue the tuning command.
This fix allows power management to work properly for those tuners behind an
i2c gate (in my case the problem was with the HVR-950Q)
Signed-off-by: Devin Heitmueller <devin.heitmueller at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit 3f9b46c154da5ec4facca88f82d1820eb329fd3e
Author: Devin Heitmueller <devin.heitmueller at gmail.com>
Date: Sat Nov 15 17:16:11 2008 -0300
V4L/DVB (9632): make em28xx aux audio input work
The attached patch makes the em28xx auxillary audio input work.
Tested with the HVR-950.
em28xx: make auxillary audio input work
The tuner audio input was working but the aux input wasn't. Tested with
the HVR-950.
Signed-off-by: Devin Heitmueller <devin.heitmueller at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit 3fa37deb1a287e100c7db5b4f964784fd664bee9
Author: Devin Heitmueller <devin.heitmueller at gmail.com>
Date: Sun Nov 16 00:33:32 2008 -0300
V4L/DVB (9631): Make s2api work for ATSC support
ATSC should be considered a legacy delivery system, or else fields such as
p->u.vsb.modulation do not get populated (resulting in set_frontend failures)
Cc: Steven Toth <stoth at linuxtv.org>
Signed-off-by: Devin Heitmueller <devin.heitmueller at gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit c41109fc9a13c6af0e4069dd92fdb4c5c8046649
Author: Mauro Carvalho Chehab <mchehab at redhat.com>
Date: Sat Nov 15 23:44:14 2008 -0300
V4L/DVB (9627): em28xx: Avoid i2c register error for boards without eeprom
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit df4533af7f45e87a4be470502fa3cea2f6c96da9
Author: Igor M. Liplianin <liplianin at tut.by>
Date: Tue Nov 11 18:09:28 2008 -0300
V4L/DVB (9608): Fix section mismatch warning for dm1105 during make
--
Signed-off-by: Igor M. Liplianin <liplianin at me.by>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit 4faf1004c32819035c5325879a466f27e189feb5
Author: Douglas Schilling Landgraf <dougsland at linuxtv.org>
Date: Tue Nov 11 23:56:56 2008 -0300
V4L/DVB (9605): usb-urb: fix memory leak
Free allocated memory
Signed-off-by: Douglas Schilling Landgraf <dougsland at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit 7935eeae793ff24e2d6053a9df63be71323ad634
Author: Douglas Schilling Landgraf <dougsland at linuxtv.org>
Date: Tue Nov 11 23:47:57 2008 -0300
V4L/DVB (9604): ttusb_dec: fix memory leak
Free allocated memory
Signed-off-by: Douglas Schilling Landgraf <dougsland at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit b7ed785b5f6a8dbdbd0cf8688a51c42e35205a4e
Author: Douglas Schilling Landgraf <dougsland at linuxtv.org>
Date: Tue Nov 11 23:37:39 2008 -0300
V4L/DVB (9603): dvb-ttusb-budget: Add validation for ttusb_alloc_iso_urbs
Added validation for ttusb_alloc_iso_urbs
Signed-off-by: Douglas Schilling Landgraf <dougsland at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit 11eb260a70b992b83fa2d15bb777cda3ee326c05
Author: Douglas Schilling Landgraf <dougsland at linuxtv.org>
Date: Tue Nov 11 23:30:49 2008 -0300
V4L/DVB (9602): dvb-ttusb-budget: Add NULL pointer validation
Added validation for NULL pointer
Signed-off-by: Douglas Schilling Landgraf <dougsland at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit d7c31a1e754b5140eefeeb10c3c3be17f3702452
Author: Douglas Schilling Landgraf <dougsland at linuxtv.org>
Date: Tue Nov 11 23:27:59 2008 -0300
V4L/DVB (9601): ttusb_dec: Add NULL pointer validation
Added validation for NULL pointer
Signed-off-by: Douglas Schilling Landgraf <dougsland at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
commit 5181e594512faeac7d7fd9620ce91105f45bf643
Author: Jiri Kosina <jkosina at suse.cz>
Date: Mon Nov 17 01:44:38 2008 +0100
HID: fix blacklist entries for greenasia/pantherlord
Fix misplaced quirk entries for devices driven by hid-pl driver. The
devices shouls be only blacklisted by generic HID driver, not completely
ignored.
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
commit c8d698849e135780738c2cb08f07f06eda982a8c
Author: Grant Likely <grant.likely at secretlab.ca>
Date: Fri Nov 14 11:10:55 2008 -0700
powerpc/virtex: Update defconfigs
Update defconfigs for running on Xilinx Virtex platforms
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
commit c7c2ffb4fb92ad79e842226aa547adb5bd045b86
Author: Grant Likely <grant.likely at secretlab.ca>
Date: Fri Nov 14 10:22:02 2008 -0700
powerpc/52xx: update defconfigs
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
commit c14464bf796d5ead1e735225ead78c566d3344ae
Author: Yuri Tikhonov <yur at emcraft.com>
Date: Fri Nov 14 10:21:57 2008 -0700
xsysace: Fix driver to use resource_size_t instead of unsigned long
This patch is a bug fix to the SystemACE driver to use resource_size_t
for physical address instead of unsigned long. This makes the driver
work correctly on 32 bit systems with 64-bit resources (e.g. PowerPC 440).
Signed-off-by: Yuri Tikhonov <yur at emcraft.com>
Signed-off-by: Ilya Yanok <yanok at emcraft.com>
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
commit a108096878aa6cb744b5280ca59395b6c0152d14
Author: Grant Likely <grant.likely at secretlab.ca>
Date: Fri Nov 14 09:59:48 2008 -0700
powerpc/virtex: fix various format/casting printk mismatches
Various printk format string in code used by the Xilinx Virtex platform
are not 32-bit/64-bit safe. Add correct casting to fix the bugs.
Reported-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
Acked-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
commit 847cdf42d589882aca683b6fb65b2c7832e92231
Author: Grant Likely <grant.likely at secretlab.ca>
Date: Fri Nov 14 05:19:00 2008 -0700
powerpc/mpc5200: fix bestcomm Kconfig dependencies
Without this patch it is possible to select drivers which require
bestcomm support without bestcomm support being selected. This
patch reworks the bestcomm dependencies to ensure the correct
bestcomm tasks are always enabled.
Reported-by: Hans Lehmann <hans.lehmann at ritter-elektronik.de>
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
commit 6612d9b0b8208c2ade3a16b8302a271ec81d45f6
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Tue Nov 11 16:02:43 2008 +0000
powerpc/44x: Fix 460EX/460GT machine check handling
Those cores use the 440A type machine check (ie, they have
MCSRR0/MCSRR1). They thus need to call the appropriate fixup
function to hook the right variant of the exception.
Without this, all machine checks become fatal due to loss
of context when entering the exception handler.
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
commit 5907630ffc2b2d133de2db18963ee5a6c5af7878
Author: Grant Erickson <gerickson at nuovations.com>
Date: Wed Oct 29 11:41:14 2008 +0000
powerpc/40x: Limit allocable DRAM during early mapping
If the size of DRAM is not an exact power of two, we may not have
covered DRAM in its entirety with large 16 and 4 MiB pages. If that
is the case, we can get non-recoverable page faults when doing the
final PTE mappings for the non-large page PTEs.
Consequently, we restrict the top end of DRAM currently allocable
by updating '__initial_memory_limit_addr' so that calls to the LMB to
allocate PTEs for "tail" coverage with normal-sized pages (or other
reasons) do not attempt to allocate outside the allowed range.
Signed-off-by: Grant Erickson <gerickson at nuovations.com>
Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
commit 3ff68a6a106c362a6811d3e51bced58e6fc87de7
Author: Mark Nelson <markn at au1.ibm.com>
Date: Thu Nov 13 21:37:41 2008 +1100
genirq: __irq_set_trigger: change pr_warning to pr_debug
Commit 0c5d1eb77a8be917b638344a22afe1398236482b (genirq: record trigger
type) caused powerpc platforms that had no set_type() function in their
struct irq_chip to spew out warnings about "No set_type function for
IRQ...". This warning isn't necessarily justified though because the
generic powerpc platform code calls set_irq_type() (which in turn calls
__irq_set_trigger) with information from the device tree to establish
the interrupt mappings, regardless of whether the PIC can actually set
a type.
A platform's irq_chip might not have a set_type function for a variety
of reasons, for example: the platform may have the type essentially
hard-coded, or as in the case for Cell interrupts are just messages
past around that have no real concept of type, or the platform
could even have a virtual PIC as on the PS3.
Signed-off-by: Mark Nelson <markn at au1.ibm.com>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 734f0bae9504216bd760493ed4744a34cfe0e7ce
Author: Daniel Gimpelevich <daniel at gimpelevich.san-francisco.ca.us>
Date: Tue Nov 11 13:57:30 2008 -0500
Input: cm109 - add keymap for ATCom AU-100 phone
Signed-off-by: Daniel Gimpelevich <daniel at gimpelevich.san-francisco.ca.us>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 4f485447973284f73e4e7cac3ab1d1e5fcd8aece
Author: Dmitri Vorobiev <dmitri.vorobiev at movial.fi>
Date: Tue Nov 11 11:40:23 2008 -0500
Input: fix the example of an input device driver
This patch fixes a wrong interrupt handler example given in the "Hello,
world!"-like input driver in Documentation/input/input-programming.txt.
Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at movial.fi>
Signed-off-by: Randy Dunlap <rdunlap at xenotime.net>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 5fb17fd9a2d05be77be91369aa2f7b0db42fc8b4
Author: Andres Salomon <dilinger at queued.net>
Date: Tue Nov 11 09:52:21 2008 -0500
Input: psmouse - fix incorrect validate_byte check in OLPC protocol
The validate_byte check logic was backwards; it should return true for
an *invalid* packet. Thanks to Jeremy Katz for spotting this one.
Signed-off-by: Andres Salomon <dilinger at debian.org>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit d6d79a785d430c0e17f7e2d662f10de022cbca93
Author: Jiri Pirko <jpirko at redhat.com>
Date: Tue Nov 11 09:43:21 2008 -0500
Input: atkbd - cancel delayed work before freeing its structure
Pointed out by Oleg Nesterov. Since delayed work is used here, use of
flush_scheduled_work() is not sufficient in atkbd_disconnect(). It does
not wait for scheduled delayed work to finish. This patch prevents
delayed work to be processed after freeing atkbd structure (used struct
delayed_work is part of atkbd) by cancelling this delayed work.
Signed-off-by: Jiri Pirko <jpirko at redhat.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit a8215b81cc31cf267506bc6a4a4bfe93f4ca1652
Author: Matthew Garrett <mjg at redhat.com>
Date: Tue Nov 11 09:40:42 2008 -0500
Input: atkbd - add keymap quirk for Inventec Symphony systems
The Zepto 6615WD laptop (rebranded Inventec Symphony system) needs a
key release quirk for its volume keys to work. The attached patch adds
the quirk to the atkbd driver.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=460237
Signed-off-by: Matthew Garrett <mjg at redhat.com>
Signed-off-by: Adel Gadllah <adel.gadllah at gmail.com>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit 786b11cc0f505e44c29f778fd329dafafafed76c
Author: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
Date: Tue Nov 11 09:37:14 2008 -0500
Input: i8042 - add Dell XPS M1530 to nomux list
Dell XPS M1530 needs i8042.nomux=1 for ALPS touchpad to work as
reported on https://qa.mandriva.com/show_bug.cgi?id=43532
It is said that before A08 bios version this isn't needed (I don't
have the hardware so can't check), and suppose this will not break
with bios versions before A08.
Signed-off-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
Tested-by: Andreas Ericsson <ae at op5.se>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
commit f131e2436ddbac2527bb2d6297a823aae4b024f8
Author: Ingo Molnar <mingo at elte.hu>
Date: Sat Nov 8 09:57:40 2008 +0100
irq: fix typo
Impact: build fix
fix build failure on UP.
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 6c2e94033df5ca11149e52dd179b8dde3172e9bf
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Fri Nov 7 12:33:49 2008 +0100
x86: apic honour irq affinity which was set in early boot
setup_ioapic_dest() is called after the non boot cpus have been
brought up. It sets the irq affinity of all already configured
interrupts to all cpus and ignores affinity settings which were
done by the early bootup code.
If the IRQ_NO_BALANCING or IRQ_AFFINITY_SET flags are set then use the
affinity mask from the irq descriptor and not TARGET_CPUS.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 612e3684c1b7752d2890510e4f90115fd1eb2afb
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Fri Nov 7 13:58:46 2008 +0100
genirq: fix the affinity setting in setup_irq
The affinity setting in setup irq is called before the NO_BALANCING
flag is checked and might therefore override affinity settings from the
calling code with the default setting.
Move the NO_BALANCING flag check before the call to the affinity
setting.
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit f6d87f4bd259cf33e092cd1a8fde05f291c47af1
Author: Thomas Gleixner <tglx at linutronix.de>
Date: Fri Nov 7 13:18:30 2008 +0100
genirq: keep affinities set from userspace across free/request_irq()
Impact: preserve user-modified affinities on interrupts
Kumar Galak noticed that commit
18404756765c713a0be4eb1082920c04822ce588 (genirq: Expose default irq
affinity mask (take 3))
overrides an already set affinity setting across a free /
request_irq(). Happens e.g. with ifdown/ifup of a network device.
Change the logic to mark the affinities as set and keep them
intact. This also fixes the unlocked access to irq_desc in
irq_select_affinity() when called from irq_affinity_proc_write()
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Ingo Molnar <mingo at elte.hu>
commit 2ad49887150894b9ed6a87a76b409adceee6b074
Author: Vitaliy Gusev <vgusev at openvz.org>
Date: Wed Nov 5 18:27:18 2008 +0300
UBI: Don't exit from ubi_thread until kthread_should_stop() is true
If ubi_thread() exits but kthread_should_stop() is not true
then kthread_stop() will never return and cleanup thread
will forever stay in "D" state.
Signed-off-by: Vitaliy Gusev <vgusev at openvz.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
commit b77bcb07897f1a9cd9d1d78691896dcdb0fd1a22
Author: Zoltan Sogor <weth at inf.u-szeged.hu>
Date: Wed Oct 29 09:50:02 2008 +0100
UBI: fix EBADMSG handling
'ubi_io_read_data()' may return EBADMSG in case of an ECC error,
and we should not panic because of this. We have CRC32 checksum
and may check the data. So just ignore the EBADMSG error.
This patch also fixes a minor spelling error at the same time.
Signed-off-by: Zoltan Sogor <weth at inf.u-szeged.hu>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
commit 9a5415fbe87ad7b99ecf9b7ef6bf091c7479f2a4
Author: Vojtech Pavlik <vojtech at suse.cz>
Date: Thu Oct 30 09:11:40 2008 -0400
Input: elo - fix format string in elo driver
Fix typo in format string.
Signed-off-by: Vojtech Pavlik <vojtech at suse.cz>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
Signed-off-by: Dmitry Torokhov <dtor at mail.ru>
-----------------------------------------------------------------------
Summary of changes:
Documentation/DMA-API.txt | 8 +-
Documentation/cpu-freq/user-guide.txt | 12 +
Documentation/filesystems/ocfs2.txt | 3 -
Documentation/filesystems/proc.txt | 27 +
.../filesystems/ramfs-rootfs-initramfs.txt | 12 +-
Documentation/input/input-programming.txt | 3 +-
Documentation/sound/alsa/ALSA-Configuration.txt | 5 +-
Documentation/spi/spi-summary | 2 +-
Documentation/tracers/mmiotrace.txt | 6 +-
Makefile | 4 +-
arch/Kconfig | 2 -
arch/alpha/kernel/pci.c | 2 +-
arch/alpha/kernel/smp.c | 6 +-
arch/alpha/kernel/traps.c | 4 +-
arch/arm/configs/corgi_defconfig | 2 +-
arch/arm/mach-pxa/mioa701.c | 2 +-
arch/arm/mach-pxa/mioa701_bootresume.S | 1 +
arch/arm/mach-pxa/palmtx.c | 150 ++++--
arch/arm/mach-pxa/pcm990-baseboard.c | 1 +
arch/arm/mach-s3c2410/include/mach/spi-gpio.h | 1 +
arch/arm/plat-omap/gpio.c | 5 +-
arch/arm/plat-omap/include/mach/pm.h | 2 +-
arch/frv/kernel/sys_frv.c | 17 +-
arch/ia64/include/asm/ptrace.h | 2 -
arch/ia64/sn/kernel/io_init.c | 2 +-
arch/m32r/kernel/head.S | 4 +-
arch/m32r/kernel/vmlinux.lds.S | 1 +
arch/mips/include/asm/bug.h | 29 +-
arch/mips/include/asm/ptrace.h | 4 -
arch/mn10300/kernel/gdb-stub.c | 24 +-
arch/parisc/include/asm/parisc-device.h | 4 +-
arch/parisc/include/asm/posix_types.h | 3 +-
arch/parisc/include/asm/ptrace.h | 2 -
arch/parisc/kernel/drivers.c | 6 +-
arch/parisc/kernel/traps.c | 43 +-
arch/powerpc/boot/dts/mpc832x_rdb.dts | 4 +-
arch/powerpc/boot/dts/mpc8572ds.dts | 2 +-
.../virtex5_defconfig => 40x/virtex_defconfig} | 263 +++++----
arch/powerpc/configs/44x/virtex5_defconfig | 234 +++++----
arch/powerpc/configs/52xx/cm5200_defconfig | 169 +++++--
arch/powerpc/configs/52xx/lite5200b_defconfig | 206 ++++++--
arch/powerpc/configs/52xx/motionpro_defconfig | 168 +++++--
arch/powerpc/configs/52xx/pcm030_defconfig | 182 +++++--
arch/powerpc/configs/52xx/tqm5200_defconfig | 180 +++++--
arch/powerpc/configs/86xx/gef_sbc610_defconfig | 2 +-
arch/powerpc/configs/mpc5200_defconfig | 573 +++++++++++++++-----
arch/powerpc/configs/ppc40x_defconfig | 92 +++-
arch/powerpc/configs/ppc44x_defconfig | 92 +++-
arch/powerpc/include/asm/mmu-hash64.h | 1 -
arch/powerpc/include/asm/ptrace.h | 2 -
arch/powerpc/kernel/cpu_setup_44x.S | 7 +-
arch/powerpc/kernel/entry_64.S | 8 +-
arch/powerpc/kernel/prom_parse.c | 7 +-
arch/powerpc/kernel/sysfs.c | 2 +
arch/powerpc/mm/40x_mmu.c | 16 +-
arch/powerpc/mm/hugetlbpage.c | 2 +-
arch/powerpc/mm/numa.c | 122 +++--
arch/powerpc/platforms/cell/axon_msi.c | 36 +-
arch/powerpc/platforms/cell/smp.c | 9 +-
arch/powerpc/platforms/cell/spufs/file.c | 3 +
arch/powerpc/sysdev/bestcomm/Kconfig | 9 +-
arch/powerpc/sysdev/mpic.c | 9 +-
arch/powerpc/sysdev/xilinx_intc.c | 4 +-
arch/s390/defconfig | 74 ++-
arch/s390/include/asm/pgtable.h | 2 -
arch/s390/include/asm/ptrace.h | 4 +-
arch/s390/include/asm/syscall.h | 28 +-
arch/s390/kernel/asm-offsets.c | 2 +-
arch/s390/kernel/compat_signal.c | 2 +-
arch/s390/kernel/entry.S | 21 +-
arch/s390/kernel/entry64.S | 23 +-
arch/s390/kernel/init_task.c | 2 +-
arch/s390/kernel/ptrace.c | 2 +-
arch/s390/kernel/signal.c | 6 +-
arch/s390/kernel/time.c | 13 +-
arch/s390/kernel/vmlinux.lds.S | 3 +-
arch/sparc/include/asm/ptrace_64.h | 2 -
arch/sparc/kernel/cpu.c | 2 +-
arch/sparc/kernel/head.S | 2 +-
arch/sparc/kernel/smp.c | 4 +-
arch/sparc/kernel/sun4d_smp.c | 4 +-
arch/sparc/kernel/sun4m_smp.c | 2 +-
arch/sparc/kernel/trampoline.S | 4 +-
arch/sparc/kernel/vmlinux.lds.S | 1 +
arch/sparc/mm/srmmu.c | 14 +-
arch/sparc64/kernel/smp.c | 4 +-
arch/sparc64/mm/init.c | 2 +-
arch/x86/boot/tty.c | 2 +-
arch/x86/include/asm/ds.h | 6 +-
arch/x86/include/asm/pci_64.h | 14 -
arch/x86/include/asm/ptrace.h | 2 -
arch/x86/kernel/Makefile | 2 +-
arch/x86/kernel/apic.c | 2 +-
arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 18 +-
arch/x86/kernel/cpu/cpufreq/powernow-k8.h | 17 +-
arch/x86/kernel/ds.c | 88 ++--
arch/x86/kernel/i387.c | 2 +-
arch/x86/kernel/io_apic.c | 48 +-
arch/x86/kernel/kvmclock.c | 2 +-
arch/x86/kernel/pci-calgary_64.c | 2 +-
arch/x86/kernel/xsave.c | 2 +-
arch/x86/oprofile/op_model_ppro.c | 2 +-
arch/x86/pci/fixup.c | 25 +-
arch/x86/xen/mmu.c | 21 +-
arch/x86/xen/smp.c | 2 +-
arch/x86/xen/xen-ops.h | 2 +-
drivers/acpi/battery.c | 9 +
drivers/acpi/blacklist.c | 401 +--------------
drivers/acpi/ec.c | 3 +-
drivers/acpi/osl.c | 104 +---
drivers/acpi/scan.c | 10 -
drivers/acpi/sleep/main.c | 40 ++-
drivers/acpi/toshiba_acpi.c | 2 -
drivers/acpi/utils.c | 16 +-
drivers/ata/ata_piix.c | 15 +
drivers/ata/libata-core.c | 21 +
drivers/ata/pata_rb532_cf.c | 15 +-
drivers/block/xsysace.c | 23 +-
drivers/char/agp/uninorth-agp.c | 2 +-
drivers/char/istallion.c | 4 +-
drivers/char/tty_io.c | 15 +-
drivers/char/xilinx_hwicap/xilinx_hwicap.c | 9 +-
drivers/crypto/talitos.c | 4 +-
drivers/edac/i82875p_edac.c | 14 +-
drivers/firewire/fw-sbp2.c | 5 +
drivers/gpu/drm/drm_drv.c | 2 +
drivers/gpu/drm/drm_irq.c | 4 +-
drivers/gpu/drm/i915/i915_dma.c | 7 +
drivers/gpu/drm/i915/i915_drv.h | 11 +
drivers/gpu/drm/i915/i915_gem.c | 74 ++--
drivers/gpu/drm/i915/i915_irq.c | 293 ++++++-----
drivers/gpu/drm/i915/i915_opregion.c | 18 +-
drivers/gpu/drm/i915/i915_suspend.c | 6 +
drivers/gpu/drm/mga/mga_dma.c | 8 +
drivers/gpu/drm/mga/mga_irq.c | 5 -
drivers/gpu/drm/r128/r128_drv.c | 6 +
drivers/gpu/drm/r128/r128_drv.h | 1 +
drivers/gpu/drm/r128/r128_irq.c | 2 +-
drivers/gpu/drm/radeon/radeon_cp.c | 6 +
drivers/gpu/drm/radeon/radeon_irq.c | 5 -
drivers/gpu/drm/via/via_irq.c | 1 -
drivers/gpu/drm/via/via_map.c | 11 +-
drivers/hid/hid-apple.c | 6 +-
drivers/hid/hid-core.c | 14 +-
drivers/hid/hid-ids.h | 1 +
drivers/hid/hid-pl.c | 2 +
drivers/hid/usbhid/hid-core.c | 18 +-
drivers/hid/usbhid/usbhid.h | 1 -
drivers/hwmon/applesmc.c | 1 +
drivers/i2c/busses/i2c-parport.c | 4 +-
drivers/i2c/chips/isp1301_omap.c | 65 ++-
drivers/i2c/i2c-core.c | 2 +-
drivers/ide/icside.c | 4 +-
drivers/ieee1394/highlevel.c | 25 +-
drivers/ieee1394/hosts.h | 4 +
drivers/ieee1394/sbp2.c | 14 +-
drivers/infiniband/hw/ehca/ehca_classes.h | 4 +-
drivers/infiniband/hw/ehca/ehca_main.c | 3 +-
drivers/infiniband/hw/ehca/ehca_qp.c | 26 +-
drivers/infiniband/hw/ehca/ehca_reqs.c | 51 +-
drivers/infiniband/hw/mlx4/cq.c | 5 +
drivers/input/ff-memless.c | 5 +-
drivers/input/keyboard/atkbd.c | 27 +-
drivers/input/misc/cm109.c | 37 ++-
drivers/input/mouse/hgpk.c | 2 +-
drivers/input/serio/i8042-x86ia64io.h | 14 +
drivers/input/tablet/wacom.h | 13 +-
drivers/input/tablet/wacom_sys.c | 228 +++++++-
drivers/input/tablet/wacom_wac.c | 160 +++++-
drivers/input/tablet/wacom_wac.h | 4 +
drivers/input/touchscreen/elo.c | 2 +-
drivers/input/xen-kbdfront.c | 6 +-
drivers/isdn/hisax/config.c | 16 +-
drivers/macintosh/rack-meter.c | 10 +-
drivers/media/dvb/dm1105/dm1105.c | 2 +-
drivers/media/dvb/dvb-core/dvb_frontend.c | 5 +-
drivers/media/dvb/dvb-usb/af9015.c | 8 +-
drivers/media/dvb/dvb-usb/dib0700.h | 5 +-
drivers/media/dvb/dvb-usb/dib0700_core.c | 16 +
drivers/media/dvb/dvb-usb/dib0700_devices.c | 139 +++++-
drivers/media/dvb/dvb-usb/usb-urb.c | 19 +-
drivers/media/dvb/siano/sms-cards.c | 2 +-
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 15 +-
drivers/media/dvb/ttusb-dec/ttusb_dec.c | 7 +
drivers/media/video/em28xx/em28xx-audio.c | 33 +-
drivers/media/video/em28xx/em28xx-core.c | 58 ++-
drivers/media/video/em28xx/em28xx-i2c.c | 10 +-
drivers/media/video/em28xx/em28xx-video.c | 140 +++--
drivers/media/video/em28xx/em28xx.h | 6 +
drivers/media/video/gspca/conex.c | 3 +
drivers/media/video/gspca/finepix.c | 8 +
drivers/media/video/gspca/gspca.c | 56 +-
drivers/media/video/gspca/gspca.h | 6 +-
drivers/media/video/gspca/pac7311.c | 3 +
drivers/media/video/gspca/spca501.c | 3 +
drivers/media/video/gspca/spca505.c | 4 +
drivers/media/video/gspca/spca561.c | 3 +
drivers/media/video/gspca/vc032x.c | 3 +
drivers/media/video/gspca/zc3xx.c | 3 +
drivers/media/video/s2255drv.c | 2 +-
drivers/misc/sony-laptop.c | 4 +-
drivers/misc/thinkpad_acpi.c | 57 ++-
drivers/mtd/ubi/eba.c | 2 +-
drivers/mtd/ubi/scan.c | 2 +-
drivers/mtd/ubi/wl.c | 3 +-
drivers/net/Kconfig | 3 +-
drivers/net/ixgbe/ixgbe_main.c | 9 +-
drivers/net/mlx4/main.c | 8 +
drivers/net/mlx4/mlx4.h | 1 +
drivers/net/mlx4/port.c | 39 ++-
drivers/net/pcmcia/ibmtr_cs.c | 2 +-
drivers/net/smc911x.c | 10 +-
drivers/net/smc91x.c | 10 +-
drivers/net/xen-netfront.c | 6 +-
drivers/parport/parport_serial.c | 2 +
drivers/pci/pci.c | 2 +-
drivers/rapidio/rio-scan.c | 4 +-
drivers/rapidio/rio.c | 2 +-
drivers/scsi/advansys.c | 4 +
drivers/scsi/gdth.c | 12 +-
drivers/serial/uartlite.c | 4 +-
drivers/spi/au1550_spi.c | 26 +-
drivers/spi/mpc52xx_psc_spi.c | 5 +-
drivers/spi/spi_imx.c | 25 +-
drivers/spi/spi_s3c24xx_gpio.c | 3 +-
drivers/spi/spidev.c | 4 +-
drivers/usb/gadget/fsl_qe_udc.c | 3 +
drivers/usb/gadget/fsl_usb2_udc.c | 3 +
drivers/usb/gadget/pxa25x_udc.c | 14 +-
drivers/usb/host/ehci-pci.c | 9 +-
drivers/usb/host/ehci.h | 12 +-
drivers/usb/serial/console.c | 1 +
drivers/usb/serial/option.c | 35 ++
drivers/usb/storage/unusual_devs.h | 19 +
drivers/video/aty/radeon_accel.c | 21 +-
drivers/video/aty/radeon_base.c | 18 +
drivers/video/console/fbcon.c | 9 +-
drivers/video/omap/Makefile | 1 -
drivers/video/omap/lcd_sx1.c | 327 -----------
drivers/video/xen-fbfront.c | 6 +-
drivers/video/xilinxfb.c | 5 +-
drivers/w1/masters/Kconfig | 2 +-
fs/buffer.c | 1 +
fs/cifs/file.c | 77 ++-
fs/eventpoll.c | 85 +++-
fs/ntfs/debug.h | 8 +-
fs/ocfs2/buffer_head_io.c | 15 +-
fs/ocfs2/dlm/dlmfs.c | 4 +-
fs/ocfs2/dlm/userdlm.h | 2 +-
fs/ocfs2/dlmglue.c | 3 +-
fs/ocfs2/ocfs2.h | 2 +-
fs/ocfs2/stack_user.c | 3 +
fs/udf/inode.c | 1 +
include/acpi/acpredef.h | 4 +-
include/drm/drmP.h | 1 +
include/linux/compat.h | 2 -
include/linux/highmem.h | 2 +
include/linux/idr.h | 3 +-
include/linux/irq.h | 11 +-
include/linux/libata.h | 1 +
include/linux/memory.h | 2 +-
include/linux/mlx4/device.h | 1 +
include/linux/page_cgroup.h | 4 +-
include/linux/sched.h | 4 +
kernel/cpu.c | 2 +-
kernel/cpuset.c | 2 +-
kernel/irq/internals.h | 2 +
kernel/irq/manage.c | 68 ++-
kernel/irq/migration.c | 11 -
kernel/irq/proc.c | 2 +-
kernel/lockdep.c | 4 +-
kernel/panic.c | 1 +
kernel/profile.c | 4 +-
kernel/ptrace.c | 4 +-
kernel/sched.c | 5 +-
kernel/sysctl.c | 10 +
kernel/trace/ring_buffer.c | 2 +-
kernel/trace/trace_mmiotrace.c | 16 +-
kernel/trace/trace_stack.c | 24 +-
lib/idr.c | 14 +-
mm/memory_hotplug.c | 9 +-
mm/page_cgroup.c | 56 ++-
mm/slub.c | 6 +-
mm/sparse.c | 2 +-
mm/vmalloc.c | 20 +-
mm/vmscan.c | 2 +-
scripts/kernel-doc | 10 +-
sound/pci/hda/hda_codec.c | 4 +-
sound/pci/hda/patch_sigmatel.c | 170 ++++--
sound/soc/fsl/Kconfig | 3 +-
sound/sound_core.c | 6 +-
291 files changed, 4466 insertions(+), 2755 deletions(-)
copy arch/powerpc/configs/{44x/virtex5_defconfig => 40x/virtex_defconfig} (86%)
delete mode 100644 drivers/video/omap/lcd_sx1.c
hooks/post-receive
--
XFS development tree
More information about the xfs
mailing list