summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge master.kernel.org:/home/rmk/linux-2.6-drvmodelLinus Torvalds2005-10-31199-156/+260
|\ | | | | | | Manual #include fixups for clashes - there may be some unnecessary
| * [DRIVER MODEL] Add missing driver_unregister to IMX serial driverRussell King2005-10-301-0/+1
| | | | | | | | | | | | | | | | Fix the IMX serial driver to unregister its driver structure when it is unloaded. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
| * [DRIVER MODEL] Add missing driver_unregister in i2c-s3c2410 failure path.Russell King2005-10-301-2/+5
| | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
| * [DRIVER MODEL] Add missing platform_device.h header.Russell King2005-10-291-0/+40
| | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * Create platform_device.h to contain all the platform device details.Russell King2005-10-29198-158/+214
| | | | | | | | | | | | | | | | Convert everyone who uses platform_bus_type to include linux/platform_device.h. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Input: adbhid - fix OOPS introduced by dynalloc conversionPaul Mackerras2005-10-311-0/+1
| | | | | | | | | | | | | | | | The problem is that adbhid[]->input is NULL, so the kernel oopses with a null pointer dereference as soon as a key is pressed. Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: lkkbd - fix debug message in lkkbd_interrupt()Dmitry Torokhov2005-10-311-1/+1
| | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: pcspkr - fix setting name and phys for the deviceDmitry Torokhov2005-10-311-1/+1
| | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: fix input_dev registration messageDmitry Torokhov2005-10-311-1/+1
| | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: evdev - allow querying SW state from compat ioctlDmitry Torokhov2005-10-311-0/+3
| | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: evdev - allow querying EV_SW bits from compat_ioctlDmitry Torokhov2005-10-311-0/+1
| | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | powerpc: import a fix from arch/ppc/mm/pgtable.cPaul Mackerras2005-10-311-3/+1
| | | | | | | | | | | | ... namely, the change to the 2-argument pte_alloc_kernel. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | powerpc: apply recent changes to merged codePaul Mackerras2005-10-316-12/+6
| | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
* | Merge ../linux-2.6 by handPaul Mackerras2005-10-312476-58503/+118063
|\ \
| * \ Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds2005-10-301-2/+1
| |\ \
| | * | [SERIAL] remove unneeded code from serial_core.cJayachandran C2005-10-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes an issue reported by Coverity in serial/serial_core.c Error reported: Variable "&((info)->tty)->flags" tracked as NULL was passed to a function that dereferences it. The later statements in the function assumes 'info->tty != NULL', so this check is not necessary. Probably a 'BUG_ON(info->tty == NULL)' can be added. Signed-off-by: Jayachandran C. <c.jayachandran at gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-10-3027-467/+557
| |\ \ \
| | * | | [ARM] arch-ixp4xx/io.h: make const args const to remove compiler warningJohn Bowler2005-10-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiler warning fix; the inline callers of these APIs were changed to have const vaddr parameters. Signed-off-by: John Bowler <jbowler@acm.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] Support pcmcia slot on sharp sl-5500Pavel Machek2005-10-303-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for pcmcia slot on sharp zaurus sl-5500. pxa2xx_sharpsl.c thus becomes quite miss-named, but I guess that is not worth fixing? Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] Sharp sl-5500 touchscreen supportPavel Machek2005-10-301-21/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for sharp zaurus sl-5500 touchscreen. It introduces some not-too-nice ifs, but I guess copying whole ucb1x00-ts.c would be bad idea... Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] fix ixp2x00 defconfig NR_UARTS optionsDeepak Saxena2005-10-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IXDP2[48]00 have only 1 UART on the board. Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] fix bogus cast in IXP2000 I/O macroDeepak Saxena2005-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Physical addresses are not valid pointers of any sort and should not be cast to such. Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] 3049/1: More optimized libgcc functionsNicolas Pitre2005-10-3011-312/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Nicolas Pitre This patch gets rid of the last C implementations of needed libgcc functions for the kernel, replacing them with optimized assembly versions. Those functions are: __ashldi3 __ashrdi3 __lshrdi3 __muldi3 __ucmpdi2 The first 3 were lifted from gcc, the other two were written from scratch. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] Clean up dmabounceRussell King2005-10-301-79/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encapsulate pool data into dmabounce_pool. Only account successful allocations. Use dma_mapping_error(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] Turn ARM RiscPC PCF8583 i2c RTC driver into a proper moduleRussell King2005-10-301-17/+63
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] Make v6 copypage function static and cleanup pgprotsRussell King2005-10-301-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We know what pgprot we're going to use, so don't #define it. Also, since we select the nonaliasing/aliasing copypage implementation at run time, there's no point having it globally visible. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] Re-organise die()Russell King2005-10-301-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide __die() which can be called from various contexts to provide an oops report. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] 3069/1: Add spitz irda platform supportRichard Purdie2005-10-301-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Richard Purdie Add spitz irda platform support Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] 3068/1: Add corgi irda platform supportRichard Purdie2005-10-301-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Richard Purdie Add corgi irda platform support Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] 3067/1: Add poodle irda platform supportRichard Purdie2005-10-301-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Richard Purdie Add poodle irda platform support Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [ARM] 3066/1: Fix PXA irda driver suspend/resume functionsRichard Purdie2005-10-301-10/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Richard Purdie Update the PXA irda driver to match the recent platform device suspend/resume level changes. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | Merge master.kernel.org:/home/rmk/linux-2.6-mmcLinus Torvalds2005-10-302-3/+8
| |\ \ \
| | * | | [MMC] Use command class to determine read-only statusPierre Ossman2005-10-301-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a card doesn't support the "write block" command class then any attempts to open the device should reflect this by denying write access. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | | [MMC] pxamci doesn't need to include asm/irq.hRussell King2005-10-301-1/+0
| | |/ / | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [PATCH] fat: Remove duplicate directory scanning codePekka Enberg2005-10-301-123/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes duplicate directory scanning code from fs/fat/dir.c. The two functions that share identical code are fat_readdirx() and fat_search_long(). This patch also renames fat_readdirx to __fat_readdir(). Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] fat: remove the unneeded vfat_find() in vfat_rename()OGAWA Hirofumi2005-10-302-21/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, vfat_rename() is using vfat_find() for sanity check. This removes that sanity check, the cost of sanity check is too high. Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] fat: cleanup and optimization of checksumOGAWA Hirofumi2005-10-303-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] fix missing includesTim Schmielau2005-10-30180-18/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I recently picked up my older work to remove unnecessary #includes of sched.h, starting from a patch by Dave Jones to not include sched.h from module.h. This reduces the number of indirect includes of sched.h by ~300. Another ~400 pointless direct includes can be removed after this disentangling (patch to follow later). However, quite a few indirect includes need to be fixed up for this. In order to feed the patches through -mm with as little disturbance as possible, I've split out the fixes I accumulated up to now (complete for i386 and x86_64, more archs to follow later) and post them before the real patch. This way this large part of the patch is kept simple with only adding #includes, and all hunks are independent of each other. So if any hunk rejects or gets in the way of other patches, just drop it. My scripts will pick it up again in the next round. Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Remove duplicate code in signal.cPaul E. McKenney2005-10-301-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Combine a bit of redundant code between force_sig_info() and force_sig_specific(). Signed-off-by: paulmck@us.ibm.com Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] remove unneeded SI_TIMER checksOleg Nesterov2005-10-301-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes checks for ->si_code == SI_TIMER from send_signal, specific_send_sig_info, __group_send_sig_info. I think posix-timers.c used these functions some time ago, now it sends signals via send_{,group_}sigqueue, so these hooks are unneeded. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] cleanup the usage of SEND_SIG_xxx constantsOleg Nesterov2005-10-303-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch simplifies some checks for magic siginfo values. It should not change the behaviour in any way. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] remove hardcoded SEND_SIG_xxx constantsOleg Nesterov2005-10-303-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch replaces hardcoded SEND_SIG_xxx constants with their symbolic names. No changes in affected .o files. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] hpet: hpet driver cleanupsRandy Dunlap2005-10-301-30/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use kzalloc() instead of kmalloc + memset. - Clean/fix some printk's. - Use NULL for pointers instead of 0. - Combine hpet busy searching locations into a function call. Signed-off-by: Randy Dunlap <randy_d_dunlap@linux.intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] hpet: use HPET physical addresses for dup. detectionRandy Dunlap2005-10-301-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use HPET physical address to detect duplicates, not logical addresses. Using logical (mapped) addresses fails to detect duplicates because ioremap() returns a new mapped address each time. - iounmap() regions when duplicate/busy areas are found. Signed-off-by: Randy Dunlap <randy_d_dunlap@linux.intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] hpet: allow HPET FIXED_MEM32 resource typeRandy Dunlap2005-10-301-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the ACPI HPET description table to use a resource type of FIXED_MEM32 for the HPET reource. Use the fixed resoure size of 1 KB for the HPET resource as per the HPET spec. Signed-off-by: Randy Dunlap <randy_d_dunlap@linux.intel.com> Acked-by: Bob Picco <bob.picco@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] hpet: simplify initialization messageClemens Ladisch2005-10-301-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When booting, display the timer frequency in Hertz instead of as tick length in nanoseconds. Apart from saving a local variable, this makes the message more easily comprehensible. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Cc: Bob Picco <bob.picco@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] hpet: remove superfluous indirectionsClemens Ladisch2005-10-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the hpet_ioctl_common() function, devp->hd_hpets is already cached in the hpetp variable, so we can use just that. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Cc: Bob Picco <bob.picco@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] hpet: fix access to multiple HPET devicesClemens Ladisch2005-10-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix two instances where a function would access the first HPET device instead of the current one. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Cc: Bob Picco <bob.picco@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] hpet: fix uninitialized variable in hpet_register()Clemens Ladisch2005-10-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear the ht_opaque field in the hpet_register() function before searching for a free timer to prevent the function from incorrectly assuming that the search succeeded afterwards. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Cc: Bob Picco <bob.picco@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] hpet: fix division by zero in HPET_INFOClemens Ladisch2005-10-301-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a division by zero that happened when the HPET_INFO ioctl was called before a timer frequency had been set. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Cc: Bob Picco <bob.picco@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
View Lorry Controller Status