aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge master.kernel.org:/home/rmk/linux-2.6-mmcLinus Torvalds2005-07-02
|\
| * [PATCH] MMC: wbsd cleanupsAdrian Bunk2005-07-01
| | | | | | | | | | | | | | | | | | This patch contains the following possible cleanups: - make some needlessly global code static - remove the unneeded global function DBG_REG Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [PATCH] MMC: wbsd delayed insertionPierre Ossman2005-07-01
| | | | | | | | | | | | | | | | Wait 0.5 seconds before scanning for cards after an insertion interrupt. The electrical connection needs this time to stabilise for some cards. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [PATCH] MMC: Fix divdi3 reference in mmci.cRussell King2005-07-01
| | | | | | | | | | | | Use do_div() instead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-07-02
|\ \
| * | [PATCH] ARM: replace schedule_timeout() with msleep()Nishanth Aravamudan2005-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use msleep() instead of schedule_timeout() to guarantee the task delays as expected. Neither signals nor wait-queue events are important at this point in the code, I believe. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [PATCH] ARM: Make the magic values in head.S more obviousRussell King2005-07-01
| | | | | | | | | | | | | | | | | | | | | Make the magic address values in head.S more obvious as to where they came from. Wrap all debug code in CONFIG_DEBUG_LL. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [PATCH] ARM: 2783/1: Remove omnimeter_defconfig as there is no kernel supportBen Dooks2005-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Ben Dooks The omnimeter_defconfig does not define any machines and seems to have no other support in the current kernel. This patch removes the config file, as this is the only thing currently mentioning the ominmeter. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [PATCH] ARM: 2782/1: PXA27x MDREFR K0DB4 defineTodd Poynor2005-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Todd Poynor Add definition of K0DB4 SDCLK<0,3> divide-by-4 control/status bit in the MDREFR register for Intel XScale PXA27x. Signed-off-by: Todd Poynor <tpoynor@mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [PATCH] ARM: 2781/2: PXA27x Standby mode take 2Todd Poynor2005-07-01
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Patch from Todd Poynor Add support for PXA27x Standby mode, a low-power mode that retains CPU and some peripheral state (the existing "sleep" mode is a power-power mode that retains less state). Activated via: echo -n standby > /sys/power/state From: David Burrage and Todd Poynor Signed-off-by: Todd Poynor <tpoynor@mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | If ACPI doesn't find an irq listed, don't accept 0 as a valid PCI irq.Linus Torvalds2005-07-02
| | | | | | | | That zero just means that nothing else found any irq information either.
* | [PATCH] alpha smp fix (part #2)Ivan Kokshaysky2005-07-01
| | | | | | | | | | | | | | | | | | | | | | This fixes the bug that caused BUG_ON(!irqs_disabled()) to trigger in run_posix_cpu_timers() on alpha/smp. We didn't disable interrupts properly before calling smp_percpu_timer_interrupt(). We *do* disable interrupts everywhere except this unfortunate smp_percpu_timer_interrupt(). Fixed thus. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] fatfs sectioning fixAndrew Morton2005-07-01
| | | | | | | | | | | | | | | | | | Fixup for the recent slab leak fix Cc: Pekka Enberg <penberg@cs.helsinki.fi> Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] alpha smp fixIvan Kokshaysky2005-07-01
|/ | | | | | | | | | | | As usual, the reason of this breakage is quite silly: in do_entIF, we are checking for PS == 0 to see whether it was a kernel BUG() or userspace trap. It works, unless BUG() happens in interrupt - PS is not 0 in kernel mode due to non-zero IPL, and the things get messed up horribly then. In this particular case it was BUG_ON(!irqs_disabled()) triggered in run_posix_cpu_timers(), so we ended up shooting "current" with the bursts of one SIGTRAP and three SIGILLs on every timer tick. ;-)
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-06-30
|\
| * [PATCH] ARM: 2780/1: AFS partition length calculation fixCatalin Marinas2005-06-30
| | | | | | | | | | | | | | | | | | | | | | Patch from Catalin Marinas This patch calculates the AFS partition length by expanding the image length information to the nearest erase block boundary. This eliminates the problems with JFFS2 erasing the footer. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [PATCH] ARM: 2779/1: Fix the V bit setting for the ARM1020x CPUsCatalin Marinas2005-06-30
| | | | | | | | | | | | | | | | | | | | | | Patch from Catalin Marinas This patch fixes the V bit setting for the ARM1020x processors. At reset, this bit is automatically set to the value of the HIVECSINIT input signal which just happened to be 1 but it is not mandatory. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [PATCH] ARM: 2778/1: Add -mno-thumb-interwork to CFLAGS_ABICatalin Marinas2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Catalin Marinas The new EABI gcc adds -mthumb-interwork by default, even if -mabi=apcs-gnu is passed. This causes a warning for every compiled C file when -march=armv4 is used. The patch adds -mno-thumb-interwork if the option is supported. This is also useful since we don't need any ARM/Thumb interworking in the kernel Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [PATCH] ARM: 2777/1: Fix broken comment arch/arm/mm/proc-arm1020.SCatalin Marinas2005-06-30
| | | | | | | | | | | | | | | | | | | | Patch from Catalin Marinas This patch fixes a broken comment in the proc-arm1020.S file which prevents the file compilation Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [PATCH] ARM: Acornfb: Don't claim IRQ fbcon for cursorRussell King2005-06-30
| | | | | | | | | | | | | | | | | | | | | | The generic fbcon code tries to register and use the vsync IRQ for ARM platforms with acornfb, but forgets to disable its own cursor timer. The result is a flickering flashing cursor. Remove the code from the fbcon core to register this platform private interrupt. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [PATCH] ARM: Don't try to send a signal to pid0Russell King2005-06-30
| | | | | | | | | | | | | | | | | | If we receive an unrecognised abort during boot, don't try to send a signal to pid0, but instead report the current state. This leads to less confusing debug reports. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds2005-06-30
|\ \
| * | [PATCH] Serial: Fix small CONFIG_SERIAL_8250_NR_UARTSRussell King2005-06-30
| |/ | | | | | | | | | | | | | | | | If CONFIG_SERIAL_8250_NR_UARTS is smaller than the array size in asm/serial.h, we trampled on memory which wasn't ours. Take our big boots away by limiting the number of ports initialised to the smaller of ...NR_UARTS and the array size. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6Linus Torvalds2005-06-30
|\ \
| * | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6Greg KH2005-06-30
| |\|
| * | [PATCH] Driver core: Use klist_del() instead of klist_remove().Patrick Mochel2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use klist_del() instead of klist_remove() when unregistering devices. This will prevent a deadlock when executing a recursive unregister using device_for_each_child(). Signed-off-by Patrick Mochel <mochel@digitalimplant.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | [PATCH] driver core: change bus_rescan_devices to return voidGreg Kroah-Hartman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | No one was looking at the return value of bus_rescan_devices, and it really wasn't anything that anyone in the kernel would ever care about. So change it which enabled some counting code to be removed also. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | [PATCH] driver core: Add the ability to bind drivers to devices from userspaceGreg Kroah-Hartman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a single file, "bind", to the sysfs directory of every driver registered with the driver core. To bind a device to a driver, write the bus id of the device you wish to bind to that specific driver to the "bind" file (remember to not add a trailing \n). If that bus id matches a device on that bus, and it does not currently have a driver bound to it, the probe sequence will be initiated with that driver and device. Note, this requires that the driver itself be willing and able to accept that device (usually through a device id type table). This patch does not make it possible to override the driver's id table. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | [PATCH] driver core: Add the ability to unbind drivers to devices from userspaceGreg Kroah-Hartman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a single file, "unbind", to the sysfs directory of every device that is currently bound to a driver. To unbind the driver from the device, write anything to this file and they will be disconnected from each other. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | [PATCH] driver core: add bus_find_device & driver_find_device functionsCornelia Huck2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | Add bus_find_device() and driver_find_device() which allow searching for a device in the bus's resp. the driver's klist and obtain a reference on it. Signed-off-by: Cornelia Huck <cohuck@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6Linus Torvalds2005-06-30
|\ \ \
| * | | [PATCH] ppc64: Replace custom locking code with a spinlockMichael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hvlpevent_queue (formally ItLpQueue) has a member called xInUseWord which is used for serialising access to the queue. Because it's a word (ie. 32 bit) there's a custom 32-bit version of test_and_set_bit() or thereabouts in ItLpQueue.c. The xInUseWord is not shared with they hypervisor, so we can replace it with a spinlock and remove the custom code. There is also another locking mechanism (ItLpQueueInProcess). This is redundant because it's only manipulated while the lock's held. Remove it. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc64: Formatting cleanups in arch/ppc64/kernel/ItLpQueue.cMichael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just formatting cleanups: * rename some "nextLpEvent" variables to just "event" * make code fit in 80 columns * use brackets around if/else * use a temporary to make hvlpevent_clear_valid clearer Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc64: Cleanup whitespace in arch/ppc64/kernel/ItLpQueue.cMichael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just cleanup white space. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc64: Cleanup proc printing of event typesMichael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code that prints event counts by type uses a hand-coded number of tabs to get the alignment right. Instead use a printf alignment which will allow allow us to use the event_type strings elsewhere in the future. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc64: Simplify counting of lpevents, remove lpevent_count from pacaMichael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there's a per-cpu count of lpevents processed, a per-queue (ie. global) total count, and a count by event type. Replace all that with a count by event for each cpu. We only need to add it up int the proc code. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc64: Don't count number of events processed for callerMichael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we count the number of lpevents processed in 3 seperate places. One of these counters is never read, so just remove it. This means hvlpevent_queue_process() no longer needs to return the number of events processed. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc64: Rename ItLpQueue_* functions to hvlpevent_queue_*Michael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we've renamed the xItLpQueue structure, rename the functions that operate on it also. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc64: Rename xItLpQueue to hvlpevent_queueMichael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The xItLpQueue is a queue of HvLpEvents that we're given by the Hypervisor. Rename xItLpQueue to hvlpevent_queue and make the type struct hvlpevent_queue. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc64: Move definition of xItLpQueueMichael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The xItLpQueue is declared in LparData.c, move it into ItLpQueue.c. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc64: Make two ItLpQueue related functions staticMichael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | External parties don't need to use ItLpQueue_getNextLpEvent() or ItLpQueue_clearValid(), they're internal to ItLpQueue.c Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc64: Move xItLpQueue proc code into ItLpQueue.cMichael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the code that displays xItLpQueue values in /proc into ItLpQueue.c. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc64: Move initialisation of xItLpQueue into ItLpQueue.cMichael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The xItLpQueue is initalised manually in iSeries_setup_arch(). Move this code into ItLpQueue.c for a cleaner separation. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc64: Don't pass the pointers to xItLpQueue aroundMichael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because there's only one ItLpQueue and we know where it is, ie. xItLpQueue, there's no point passing pointers to it it around all over the place. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc64: Reorganise the paca initialisation macrosMichael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the macros that initialise the paca to remove the lpq parameter. It also rearranges them a bit with the hope of making them a bit clearer. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc64: Move set_spread_lpevents() into ItLpQueue.cMichael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only code outside ItLpQueue.c that refers to spread_lpevents is in set_apread_lpevents(), so move it inside ItLpQueue.c and make spread_lpevents static. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc64: Spread lpevents by default on iSeriesMichael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the previous patch in place, spreading lpevents by default becomes a one liner. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] ppc64: Remove lpqueue pointer from the paca on iSeriesMichael Ellerman2005-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The iSeries code keeps a pointer to the ItLpQueue in its paca struct. But all these pointers end up pointing to the one place, ie. xItLpQueue. So remove the pointer from the paca struct and just refer to xItLpQueue directly where needed. The only complication is that the spread_lpevents logic was implemented by having a NULL lpqueue pointer in the paca on CPUs that weren't supposed to process events. Instead we just compare the spread_lpevents value to the processor id to get the same behaviour. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] remove duplicate printf in arch/ppc64/boot/main.cOlaf Hering2005-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initrd size is printed as hex, add a missing 0x remove a duplicate printf when initrd is used. remove use of kernel type to access the first bytes of the initrd memarea. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | [PATCH] remove printk usage in arch/ppc64/boot/prom.cOlaf Hering2005-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | remove the printk usage in the zImage. we are not there, yet. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-23 08:52:28 -0500