03 Sep, 2008
13 commits
-
With the new firmware infrastructure in 2.6.27, some files are generated and shouldn't be
diffed; add these 2 to the "dontdiff" fileSigned-off-by: Arjan van de Ven
Signed-off-by: Linus Torvalds -
This fixes a typo in commit 2a2a64714d9c40f7705c4de1e79a5b855c7211a9 "Disable MWAIT via DMI on broken Compal board".
It allows the nomwait dmi check to actually detect the Acer 5220.
Signed-off-by: Dennis Jansen
Tested-by: Dennis Jansen
Acked-by: Zhao Yakui
Signed-off-by: Linus Torvalds -
* git://git.infradead.org/users/dwmw2/random-2.6:
[MTD] mtdchar.c: Fix regression in MEMGETREGIONINFO ioctl()
dabusb_fpga_download(): fix a memory leak
Remove '#include ' from mm/page_isolation.c
Fix modules_install on RO nfs-exported trees. -
* 'for-2.6.27' of git://linux-nfs.org/~bfields/linux:
nfsd: fix buffer overrun decoding NFSv4 acl
sunrpc: fix possible overrun on read of /proc/sys/sunrpc/transports
nfsd: fix compound state allocation error handling
svcrdma: Fix race between svc_rdma_recvfrom thread and the dto_tasklet -
Fix operator precedence bug in atari_keyb_init, which caused a failure on CT60
Signed-off-by: Michael Schmitz
Signed-off-by: Geert Uytterhoeven
Signed-off-by: Linus Torvalds -
A parisc allmodconfig build produces this:
arch/parisc/hpux/fs.c:107: error: 'buffer' undeclared (first use in this function)
Introduced by commit da574983de9f9283ba35662c8723627096e160de ("[PATCH]
fix hpux_getdents()").Helge Dille also reported this in bugzilla 11461:
http://bugzilla.kernel.org/show_bug.cgi?id=11461
and he posted an identical patch.
Signed-off-by: Stephen Rothwell
Signed-off-by: Helge Deller
Signed-off-by: Linus Torvalds -
The recent commit 16d9679f33caf7e683471647d1472bfe133d858 changed
check_hung_task() to filter out the TASK_KILLABLE tasks. We can
move this check to the caller which has to test t->state anyway.Signed-off-by: Oleg Nesterov
Acked-by: Andi Kleen
Signed-off-by: Linus Torvalds -
Fix kernel-doc warning for new function:
Warning(linux-2.6.27-rc5-git2//kernel/resource.c:448): No description found for parameter 'root'
Signed-off-by: Randy Dunlap
Signed-off-by: Linus Torvalds -
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon: downgrade debug message from info to debug. -
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] Turn off Unicode during session establishment for plaintext authentication
[CIFS] update cifs change log
cifs: fix O_APPEND on directio mounts
[CIFS] Fix plaintext authentication -
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: restore original behavior of /proc/partition when there's no partition
remove blk_register_filter and blk_unregister_filter in gendisk -
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: setup_valid_addr_bitmap_from_pavail() should be __init
sparc: Fix resource flags for PCI children in OF device tree.
sparc32: Implement smp_call_function_single(). -
Breaking lines due to some imaginary problem with a long line length is
often stupid and wrong, but never more so when it splits a string that
is printed out into multiple lines. This really ended up making it much
harder to find where some error strings were printed out, because a
simple 'grep' didn't work.I'm sure there is tons more of this particular idiocy hiding in other
places, but this particular case hit me once more last week. So fix it.Signed-off-by: Linus Torvalds
02 Sep, 2008
7 commits
-
The MEMGETREGIONINFO ioctl() in mtdchar.c was clobbering user memory by
overwriting more than intended, due the size of struct mtd_erase_region_info
changing in commit 0ecbc81adfcb9f15f86b05ff576b342ce81bbef8 ('Support
for auto locking flash on power up').Fix avoids this by copying struct members one by one with put_user(), as there
is no longer a convenient struct to use the size of as the length argument to
copy_to_user().Signed-off-by: Zev Weiss
Signed-off-by: David Woodhouse -
This patch fixes a memory leak in an error path.
Reported-by: Adrian Bunk
Signed-off-by: Adrian Bunk
Signed-off-by: David Woodhouse -
Signed-off-by: David Woodhouse
-
Fixes http://bugzilla.kernel.org/show_bug.cgi?id=11355 by avoiding a
needless rebuild of the firmware/ihex2fw tool.Signed-off-by: David Woodhouse
-
The array we kmalloc() here is not large enough.
Thanks to Johann Dahm and David Richter for bug report and testing.
Signed-off-by: J. Bruce Fields
Cc: David Richter
Tested-by: Johann Dahm -
Vegard Nossum reported
----------------------
> I noticed that something weird is going on with /proc/sys/sunrpc/transports.
> This file is generated in net/sunrpc/sysctl.c, function proc_do_xprt(). When
> I "cat" this file, I get the expected output:
> $ cat /proc/sys/sunrpc/transports
> tcp 1048576
> udp 32768> But I think that it does not check the length of the buffer supplied by
> userspace to read(). With my original program, I found that the stack was
> being overwritten by the characters above, even when the length given to
> read() was just 1.David Wagner added (among other things) that copy_to_user could be
probably used here.Ingo Oeser suggested to use simple_read_from_buffer() here.
The conclusion is that proc_do_xprt doesn't check for userside buffer
size indeed so fix this by using Ingo's suggestion.Reported-by: Vegard Nossum
Signed-off-by: Cyrill Gorcunov
CC: Ingo Oeser
Cc: Neil Brown
Cc: Chuck Lever
Cc: Greg Banks
Cc: Tom Tucker
Signed-off-by: J. Bruce Fields -
Move the cstate_alloc call so that if it fails, the response is setup to
encode the NFS error. The out label now means that the
nfsd4_compound_state has not been allocated.Signed-off-by: Andy Adamson
Signed-off-by: J. Bruce Fields
01 Sep, 2008
2 commits
-
/proc/partitions didn't use to write out the header if there was no
partition. However, recent commit 66c64afe changed the behavior.
This is nothing major but there's no reason to change user visible
behavior without a good rationale. Restore the original behavior.Note that 2.6.28 has clean up changes scheduled which will replace
this rather hacky implementation.Signed-off-by: Tejun Heo
Cc: Greg KH
Cc: Kay Sievers
Signed-off-by: Jens Axboe -
If this triggers its bad, however some machines seem to have been
triggering it for ages and we didn't know until we added the debug.So downgrade the debug now so people don't call this a regression.
Signed-off-by: Dave Airlie
30 Aug, 2008
5 commits
-
Signed-off-by: David S. Miller
-
Not used anywhere yet, but this complements the existing plain
'insert_resource()' functionality with a version that can expand the
resource we are adding in order to fix up any conflicts it has with
existing resources.Signed-off-by: Linus Torvalds
-
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: oxygen: fix distorted output on AK4396-based cards
Revert "ALSA: hda - Added model selection for iMac 24"" -
Pulling the ethernet cable on a 2.6.27-rc system with NFS mounts
currently leads to an ongoing flood of soft lockup detector backtraces
for all tasks blocked on the NFS mounts when the hickup takes
longer than 120s.I don't think NFS problems should be all that noisy.
Luckily there's a reasonably easy way to distingush this case.
Don't report task softlockup warnings for tasks in TASK_KILLABLE
state, which is used by the network file systems.I believe this patch is a 2.6.27 candidate.
Signed-off-by: Andi Kleen
Signed-off-by: Linus Torvalds -
This reverts commit a2bd7274b47124d2fc4dfdb8c0591f545ba749dd.
It wasn't really right to begin with (there's a better fix for the
problem with e820 reservations clashing with PCI BAR's pending), but it
also actually causes more regressions, so it should be reverted even
before the better fix is finalized.Rafael reports that this commit broke AHCI detection, and thus causes
the kernel to not boot on his quad core test box.Reported-and-bisected-by: Rafael J. Wysocki
Cc: Yinghai Lu
Cc: David Witbrodt
Cc: Ingo Molnar
Signed-off-by: Linus Torvalds
29 Aug, 2008
12 commits
-
When changing the sample rate, the CMI8788's master clock output becomes
unstable for a short time. The AK4396 needs the master clock to do SPI
writes, so writing to an AK4396 control register directly after a sample
rate change will garble the value. In our case, this leads to the DACs
being misconfigured to I2S sample format, which results in a wrong
output level and horrible distortions on samples louder than -6 dB.To fix this, we need to wait until the new master clock signal has
become stable before doing SPI writes.Signed-off-by: Clemens Ladisch
Signed-off-by: Takashi Iwai -
This patch remove blk_register_filter and blk_unregister_filter in
gendisk, and adds them to sd.c, sr.c. and ide-cd.cThe commit abf5439370491dd6fbb4fe1a7939680d2a9bc9d4 moved cmdfilter
from gendisk to request_queue. It turned out that in some subsystems
multiple gendisks share a single request_queue. So we get:Using physmap partition information
Creating 3 MTD partitions on "physmap-flash":
0x00000000-0x01c00000 : "User FS"
0x01c00000-0x01c40000 : "booter"
kobject (8511c410): tried to init an initialized object, something is seriously wrong.
Call Trace:
[] dump_stack+0x8/0x34
[] kobject_init+0x50/0xcc
[] kobject_init_and_add+0x24/0x58
[] blk_register_filter+0x4c/0x64
[] add_disk+0x78/0xe0
[] add_mtd_blktrans_dev+0x254/0x278
[] blktrans_notify_add+0x40/0x78
[] add_mtd_device+0xd0/0x150
[] add_mtd_partitions+0x568/0x5d8
[] physmap_flash_probe+0x2ac/0x334
[] driver_probe_device+0x12c/0x244
[] __driver_attach+0x4c/0x84
[] bus_for_each_dev+0x58/0xac
[] bus_add_driver+0xc4/0x24c
[] driver_register+0xcc/0x184
[] _stext+0x60/0x1bcIn the long term, we need to fix such subsystems but we need a quick
fix now. This patch add the command filter support to only sd and sr
though it might be useful for other SG_IO users (such as cciss).Signed-off-by: FUJITA Tomonori
Reported-by: Manuel Lauss
Signed-off-by: Jens Axboe -
When a device is under an EBUS or ISA bus, the resource flags
don't get set properly.Fix this by re-evaluating the resource flags at each level of
bus as we apply ranges on the way to the root. And let PCI
override any existing flags setting, but don't let the
default flags calculator make such overrides.Signed-off-by: David S. Miller
-
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5226/1: remove unmatched comment end.
[ARM] Skip memory holes in FLATMEM when reading /proc/pagetypeinfo
[ARM] use bcd2bin/bin2bcd
[ARM] use the new byteorder headers
[ARM] OMAP: Fix 2430 SMC91x ethernet IRQ
[ARM] OMAP: Add and update OMAP default configuration files
[ARM] OMAP: Change mailing list for OMAP in MAINTAINERS
[ARM] S3C2443: Fix the S3C2443 clock register definitions
[ARM] JIVE: Fix the spi bus numbering
[ARM] S3C24XX: pwm.c: stop debugging output
[ARM] S3C24XX: Fix sparse warnings in pwm.c
[ARM] S3C24XX: Fix spare errors in pwm-clock driver
[ARM] S3C24XX: Fix sparse warnings in arch/arm/plat-s3c24xx/gpiolib.c
[ARM] S3C24XX: Fix nor-simtec driver sparse errors
[ARM] 5225/1: zaurus: Register I2C controller for audio codecs
[ARM] orion5x: update defconfig to v2.6.27-rc4
[ARM] Orion: register UART1 on QNAP TS-209 and TS-409
[ARM] Orion: activate lm75 driver on DNS-323
[ARM] Orion: fix MAC detection on QNAP TS-209 and TS-409
[ARM] Orion: Fix boot crash on Kurobox Pro -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
Blackfin arch: Fix PM building on BF52x: No ROTWE on BF52x, add USBWE
Blackfin arch: sram: use 'unsigned long' for irqflags
Blackfin arch: let PCI depend on BROKEN
Blackfin arch: move include/asm-blackfin header files to arch/blackfin
Blackfin arch: fix bug - MPU crashes under stress
Blackfin arch: Fix bug - when to rmmod the L1_module, it stucks and then reboot the board.
Blackfin arch: dont actually need to muck with EMAC_SYSTAT for BF52x for demuxing
Blackfin arch: Add MTD Partitions for MTD_DATAFLASH, increase max SPI SCLK -
…/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:
exit signals: use of uninitialized field notify_count
lockdep: fix invalid list_del_rcu in zap_class
lockstat: repair erronous contention statistics
lockstat: fix numerical output rounding error -
…l/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: rt-bandwidth accounting fix
sched: fix sched_rt_rq_enqueue() resched idle -
…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: update defconfigs
x86: msr: fix bogus return values from rdmsr_safe/wrmsr_safe
x86: cpuid: correct return value on partial operations
x86: msr: correct return value on partial operations
x86: cpuid: propagate error from smp_call_function_single()
x86: msr: propagate errors from smp_call_function_single()
smp: have smp_call_function_single() detect invalid CPUs -
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c: Prevent log spam on some DVB adapters
i2c: Add missing kerneldoc descriptions
i2c: Fix device_init_wakeup place -
In accordance with commit f42ac38c59e0a03d6da0c24a63fb211393f484b0
("ftrace: disable tracing for suspend to ram"), disable tracing
around the suspend code in hibernation code paths.Signed-off-by: Rafael J. Wysocki
Acked-by: Steven Rostedt
Signed-off-by: Linus Torvalds -
remove unmatched comment end.
Signed-off-by: Jean-Christophe DUBOIS
Signed-off-by: Russell King
28 Aug, 2008
1 commit
-
LANMAN session setup did not support Unicode (after session setup, unicode can
still be used though).Fixes samba bug# 5319
CC: Jeff Layton
CC: Stable Kernel
Signed-off-by: Steve French
