summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tty: restore locked ioctl file opPaul Fulghum2007-06-161-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore tty locked ioctl handler which was replaced with an unlocked ioctl handler in hung_up_tty_fops by the patch: commit e10cc1df1d2014f68a4bdcf73f6dd122c4561f94 Author: Paul Fulghum <paulkf@microgate.com> Date: Thu May 10 22:22:50 2007 -0700 tty: add compat_ioctl This was reported in: [Bug 8473] New: Oops: 0010 [1] SMP The bug is caused by switching to hung_up_tty_fops in do_tty_hangup. An ioctl call can be waiting on BLK after testing for existence of the locked ioctl handler in the normal tty fops, but before calling the locked ioctl handler. If a hangup occurs at that point, the locked ioctl fop is NULL and an oops occurs. (akpm: we can remove my debugging code from do_ioctl() now, but it'll be OK to do that for 2.6.23) Signed-off-by: Paul Fulghum <paulkf@microgate.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* fix radeon setparam on 32/64 systems, harder.David Woodhouse2007-06-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | Commit 9b01bd5b284bbf519b726b39f1352023cb5e9e69 introduced a compat_ioctl handler for RADEON_SETPARAM, the sole purpose of which was to handle the fact that on i386, alignof(uint64_t)==4. Unfortunately, this handler was installed for _all_ 64-bit architectures, instead of only x86_64 and ia64. And thus it breaks 32-bit compatibility on every other arch, where 64-bit integers are aligned to 8 bytes in 32-bit mode just the same as in 64-bit mode. Arnd has a cunning plan to use 'compat_u64' with appropriate alignment attributes according to the 32-bit ABI, but for now let's just make the compat_radeon_cp_setparam routine entirely disappear on 64-bit machines whose 32-bit compat support isn't for i386. It would be a no-op with compat_u64 anyway. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Dave Airlie <airlied@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6Linus Torvalds2007-06-152-4/+7
|\ | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: ide-scsi: fix OOPS in idescsi_expiry() Resume from RAM on HPC nx6325 broken
| * ide-scsi: fix OOPS in idescsi_expiry()Bartlomiej Zolnierkiewicz2007-06-161-1/+1
| | | | | | | | | | | | drive->driver_data contains pointer to Scsi_Host not idescsi_scsi_t. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| * Resume from RAM on HPC nx6325 brokenRafael J. Wysocki2007-06-161-3/+6
| | | | | | | | | | | | | | | | | | generic_ide_resume() should check if dev->driver is not NULL before applying to_ide_driver() to it. Fix that. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
* | Merge branch 'master' of ↵Linus Torvalds2007-06-158-7/+38
|\ \ | |/ |/| | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [RXRPC] net/rxrpc/ar-connection.c: fix NULL dereference [TCP]: Fix logic breakage due to DSACK separation [TCP]: Congestion control API RTT sampling fix
| * [RXRPC] net/rxrpc/ar-connection.c: fix NULL dereferenceAdrian Bunk2007-06-151-1/+1
| | | | | | | | | | | | | | This patch fixes a NULL dereference spotted by the Coverity checker. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [TCP]: Fix logic breakage due to DSACK separationIlpo Järvinen2007-06-151-4/+5
| | | | | | | | | | | | | | | | | | | | Commit 6f74651ae626ec672028587bc700538076dfbefb is found guilty of breaking DSACK counting, which should be done only for the SACK block reported by the DSACK instead of every SACK block that is received along with DSACK information. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
| * [TCP]: Congestion control API RTT sampling fixIlpo Järvinen2007-06-157-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 164891aadf1721fca4dce473bb0e0998181537c6 broke RTT sampling of congestion control modules. Inaccurate timestamps could be fed to them without providing any way for them to identify such cases. Previously RTT sampler was called only if FLAG_RETRANS_DATA_ACKED was not set filtering inaccurate timestamps nicely. In addition, the new behavior could give an invalid timestamp (zero) to RTT sampler if only skbs with TCPCB_RETRANS were ACKed. This solves both problems. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
* | mm: Fix memory/cpu hotplug section mismatch and oops.Paul Mundt2007-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building with memory hotplug enabled and cpu hotplug disabled, we end up with the following section mismatch: WARNING: mm/built-in.o(.text+0x4e58): Section mismatch: reference to .init.text: (between 'free_area_init_node' and '__build_all_zonelists') This happens as a result of: -> free_area_init_node() -> free_area_init_core() -> zone_pcp_init() <-- all __meminit up to this point -> zone_batchsize() <-- marked as __cpuinit fo This happens because CONFIG_HOTPLUG_CPU=n sets __cpuinit to __init, but CONFIG_MEMORY_HOTPLUG=y unsets __meminit. Changing zone_batchsize() to __devinit fixes this. __devinit is the only thing that is common between CONFIG_HOTPLUG_CPU=y and CONFIG_MEMORY_HOTPLUG=y. In the long run, perhaps this should be moved to another section identifier completely. Without this, memory hot-add of offline nodes (via hotadd_new_pgdat()) will oops if CPU hotplug is not also enabled. Signed-off-by: Paul Mundt <lethal@linux-sh.org> Acked-by: Yasunori Goto <y-goto@jp.fujitsu.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> -- mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
* | Merge branch 'master' of ↵Linus Torvalds2007-06-1560-2049/+1070
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (30 commits) Blackfin SMC91X ethernet supporting driver: SMC91C111 LEDs are note drived in the kernel like in uboot Blackfin SPI driver: fix bug SPI DMA incomplete transmission Blackfin SPI driver: tweak spi cleanup function to match newer kernel changes Blackfin RTC drivers: update MAINTAINERS information Blackfin serial driver: decouple PARODD and CMSPAR checking from PARENB Blackfin serial driver: actually implement the break_ctl() function Blackfin serial driver: ignore framing and parity errors Blackfin serial driver: hook up our UARTs STP bit with userspaces CMSPAR Blackfin arch: move HI/LO macros into blackfin.h and punt the rest of macros.h as it includes VDSP macros we never use Blackfin arch: redo our linker script a bit Blackfin arch: make sure we initialize our L1 Data B section properly based on the linked kernel Blackfin arch: fix bug can not wakeup from sleep via push buttons Blackfin arch: add support for Alon Bar-Lev's dynamic kernel command-line Blackfin arch: add missing gpio.h header to fix compiling in some pm configurations Blackfin arch: As Mike pointed out range goes form m..MAX_BLACKFIN_GPIO -1 Blackfin arch: fix spelling typo in output Blackfin arch: try to split up functions like this into smaller units according to LKML review Blackfin arch: add proper ENDPROC() Blackfin arch: move more of our startup code to .init so it can be freed once we are up and running Blackfin arch: unify differences between our diff head.S files -- no functional changes ...
| * | Blackfin SMC91X ethernet supporting driver: SMC91C111 LEDs are note drived ↵Jean-Christian de Rivaz2007-06-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | in the kernel like in uboot Signed-off-by: Jean-Christian de Rivaz <jc@eclis.ch> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin SPI driver: fix bug SPI DMA incomplete transmissionBryan Wu2007-06-111-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SPI writes intermittently drop bytes at end of DMA transfer http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3205 http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=2892 Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin SPI driver: tweak spi cleanup function to match newer kernel changesMike Frysinger2007-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com> Cc: David Brownell <dbrownell@users.sourceforge.net>
| * | Blackfin RTC drivers: update MAINTAINERS informationMike Frysinger2007-06-111-0/+8
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com> Cc: Alessandro Zummo <a.zummo@towertech.it>
| * | Blackfin serial driver: decouple PARODD and CMSPAR checking from PARENBMike Frysinger2007-06-111-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | as the termios info does not stipulate that the former are dependent on the latter Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin serial driver: actually implement the break_ctl() functionMike Frysinger2007-06-111-0/+8
| | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin serial driver: ignore framing and parity errorsMike Frysinger2007-06-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | if we get a break signal, we want to ignore framing and parity errors because those will always be set (by nature of the signal) Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin serial driver: hook up our UARTs STP bit with userspaces CMSPARMike Frysinger2007-06-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | so we can now do spaced/marked parity Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: move HI/LO macros into blackfin.h and punt the rest of ↵Mike Frysinger2007-06-112-96/+5
| | | | | | | | | | | | | | | | | | | | | | | | macros.h as it includes VDSP macros we never use Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: redo our linker script a bitMike Frysinger2007-06-111-111/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | - we can start taking advantages of defines in asm-generic/vmlinux.lds.h - move our L1 relocated sections into init so it gets freed after relocation Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: make sure we initialize our L1 Data B section properly based ↵Mike Frysinger2007-06-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | on the linked kernel Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: fix bug can not wakeup from sleep via push buttonsMichael Hennerich2007-06-142-2/+11
| | | | | | | | | | | | | | | | | | Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: add support for Alon Bar-Lev's dynamic kernel command-lineMike Frysinger2007-06-111-4/+3
| | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: add missing gpio.h header to fix compiling in some pm ↵Michael Hennerich2007-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | configurations Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: As Mike pointed out range goes form m..MAX_BLACKFIN_GPIO -1Michael Hennerich2007-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: fix spelling typo in outputMike Frysinger2007-06-111-1/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: try to split up functions like this into smaller units ↵Aubrey Li2007-06-141-112/+121
| | | | | | | | | | | | | | | | | | | | | | | | according to LKML review Signed-off-by: Aubrey Li <aubrey.li@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: add proper ENDPROC()Mike Frysinger2007-06-1121-8/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | add proper ENDPROC() to close out assembly functions so size/type is set properly in the final ELF image Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: move more of our startup code to .init so it can be freed ↵Mike Frysinger2007-06-114-20/+29
| | | | | | | | | | | | | | | | | | | | | | | | once we are up and running Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: unify differences between our diff head.S files -- no ↵Mike Frysinger2007-06-113-27/+32
| | | | | | | | | | | | | | | | | | | | | | | | functional changes Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: update defconfigsMike Frysinger2007-06-115-214/+528
| | | | | | | | | | | | | | | | | | Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: scrub old console definesMike Frysinger2007-06-111-35/+0
| | | | | | | | | | | | | | | | | | | | | | | | since they arent respected anymore (use console=) and just confuse people Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: fixup Blackfin MAINTIANERS team member listBryan Wu2007-06-111-34/+36
| | | | | | | | | | | | | | | Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: implement a basic /proc/sram file for L1 allocation visibilityMike Frysinger2007-06-141-12/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | implement a basic /proc/sram file for L1 allocation visibility until we can rewrite the entire L1 allocator (which would include a proper mechanism) Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: mark our memory init functions with __init so they get freed ↵Mike Frysinger2007-06-112-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | after init Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: all symbols were offset by 4k, since we didn't have the ↵Robin Getz2007-06-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | __text label. Bug tracker: http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3231 Singed-off-by: Robin Getz <robin.getz@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: fix bug ad1836 fails to build properly for BF533-EZKITRoy Huang2007-06-141-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | bug log here: http://blackfin.uclinux.org/gf/project/uclinux-dist/tracker/?action=TrackerItemEdit&tracker_item_id=3166 Signed-off-by: Roy Huang <roy.huang@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: spelling fixesSimon Arlott2007-06-1114-17/+17
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
| * | Blackfin arch: DMA code minor naming convention fixAubrey Li2007-06-111-3/+3
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Aubrey Li <aubrey.li@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com> Cc: Pekka Enberg <penberg@cs.helsinki.fi>
| * | Blackfin arch: remove defconfig fileMike Frysinger2007-06-111-1327/+0
| | | | | | | | | | | | | | | | | | | | | | | | Since we have board-specific defconfigs and the default is set to BF537-STAMP, we no longer need this one Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
* | | Merge branch 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-blockLinus Torvalds2007-06-151-9/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block: splice: only check do_wakeup in splice_to_pipe() for a real pipe splice: fix leak of pages on short splice to pipe splice: adjust balance_dirty_pages_ratelimited() call
| * | | splice: only check do_wakeup in splice_to_pipe() for a real pipeJens Axboe2007-06-151-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only ever set do_wakeup to non-zero if the pipe has an inode backing, so it's pointless to check outside the pipe->inode check. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | | splice: fix leak of pages on short splice to pipeJens Axboe2007-06-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the destination pipe is full and we already transferred data, we break out instead of waiting for more pipe room. The exit logic looks at spd->nr_pages to see if we moved everything inside the spd container, but we decrement that variable in the loop to decide when spd has emptied. Instead we want to compare to the original page count in the spd, so cache that in a local variable. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * | | splice: adjust balance_dirty_pages_ratelimited() callJens Axboe2007-06-151-2/+8
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | As we have potentially dirtied more than 1 page, we should indicate as such to the dirty page balancing. So call balance_dirty_pages_ratelimited_nr() and pass in the approximate number of pages we dirtied. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
* | | Merge branch 'for-linus' of ↵Linus Torvalds2007-06-153-9/+28
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: KVM: Prevent guest fpu state from leaking into the host
| * | | KVM: Prevent guest fpu state from leaking into the hostAvi Kivity2007-06-153-9/+28
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The lazy fpu changes did not take into account that some vmexit handlers can sleep. Move loading the guest state into the inner loop so that it can be reloaded if necessary, and move loading the host state into vmx_vcpu_put() so it can be performed whenever we relinquish the vcpu. Signed-off-by: Avi Kivity <avi@qumranet.com>
* | | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2007-06-1510-107/+222
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix builds where MSC01E_xxx is undefined. [MIPS] Separate performance counter interrupts [MIPS] Malta: Fix for SOCitSC based Maltas
| * | | [MIPS] Fix builds where MSC01E_xxx is undefined.Chris Dearman2007-06-141-1/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Dearman <chris@mips.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | | [MIPS] Separate performance counter interruptsChris Dearman2007-06-144-46/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for performance counter overflow interrupt that is on a separate interrupt from the timer. Signed-off-by: Chris Dearman <chris@mips.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
OpenPOWER on IntegriCloud