aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-mergeLinus Torvalds2005-11-14
|\
| * powerpc: Remove __init from a function used in suspend/resume.Paul Mackerras2005-11-14
| | | | | | | | | | | | | | Suspend/resume on powermacs uses the pmac_get_boot_time function, so it can't be marked as __init. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * powerpc: Remove an extraneous and incorrect declaration of pmac_nvram_init.Paul Mackerras2005-11-14
| | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
| * powerpc: Fix clearing of the FPSCR when invoking a signal handlerPaul Mackerras2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | As pointed out by Gary Byers, we were clearing the image of the FPSCR (floating point status and control register) in the thread_struct before copying it to the user stack when invoking a signal. Thus the task would see its FPSCR getting cleared when it took a signal. While fixing it I noticed that our swapcontext system call was also clearing FPSCR. It shouldn't, so I fixed that too. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * powerpc: Fix 32-bit compile: PPC_MEMSTART was undeclaredPaul Mackerras2005-11-14
| | | | | | | | | | | | | | This defines PPC_MEMSTART as 0 because it is still used in a couple of places in the 32-bit code. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * powerpc: Mark PREP and embedded as broken for nowPaul Mackerras2005-11-14
| | | | | | | | | | | | | | | | These machines don't have working ARCH=powerpc support yet, so make them depend on BROKEN so people don't enable them inadvertently and get compile errors. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * powerpc: Export a couple of prom functionsPaul Mackerras2005-11-14
| | | | | | | | | | | | These are needed by the TPM driver, apparently. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * powerpc: Move most remaining ppc64 files over to arch/powerpcPaul Mackerras2005-11-14
| | | | | | | | | | | | | | Also deletes files in arch/ppc64 that are no longer used now that we don't compile with ARCH=ppc64 any more. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * powerpc: Move a bunch of ppc64 headers to include/asm-powerpcPaul Mackerras2005-11-14
| | | | | | | | | | | | | | ... and also delete some that are no longer used because we already had an include/asm-powerpc version of the header. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * Merge git://oak/home/sfr/kernels/iseries/workPaul Mackerras2005-11-14
| |\
| | * powerpc: iSeries build fixesStephen Rothwell2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | log_plpar_hcall_return is only used on PPC_PSERIES, so move it closer to its users and inside ifdef CONFIG_PPC_PSERIES. remove the last vestiges of systemcfg in iSeries. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| | * powerpc: have only one definition of __irq_offset_valueStephen Rothwell2005-11-13
| | | | | | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| | * powerpc: make iSeries use generic virtual irq mappingStephen Rothwell2005-11-13
| | | | | | | | | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| * | [PATCH] powerpc: kill ppc64 rtc.c, use genrtc insteadBenjamin Herrenschmidt2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the rtas RTC callbacks to rtas-rtc.c in arch/powerpc/kernel, and kills the rest of arch/ppc64/kernel/rtc.c which was just a duplicate of the genrtc functionality. Also enable build of genrtc for CONFIG_PPC64 (it just works are we already have the required callbacks) and enable it in all defconfigs. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [PATCH] powerpc: vdso fixes (take #2)Benjamin Herrenschmidt2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes various errors in the new functions added in the vDSO's, I've now verified all functions on both 32 and 64 bits vDSOs. It also fix a sign extension bug getting the initial time of day at boot that could cause the monotonic clock value to be completely on bogus for 64 bits applications (with either the vDSO or the syscall) on powermacs. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [PATCH] powerpc: Always rebuild arch/powerpc/include/asm symlinkBenjamin Herrenschmidt2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uses a FORCE dependency on the arch/powerpc/include/asm symlink so that it always gets rebuilt, thus avoiding all sort of funny errors if the .config is changed between 32 and 64 bits. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [PATCH] powerpc: Export htab start/end via device treeMichael Ellerman2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The userspace kexec-tools need to know the location of the htab on non-lpar machines, as well as the end of the kernel. Export via the device tree. NB. This patch has been updated to use "linux,x" property names. You may need to update your kexec-tools to match. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [PATCH] powerpc: Turn cpu_irq_down into kexec_cpu_downMichael Ellerman2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently have a ppc_md member called cpu_irq_down, which disables IRQs for the cpu in question. The only caller of cpu_irq_down is the kexec code. On pSeries we need to do more than just teardown IRQs at kexec time, so rename the ppc_md member to kexec_cpu_down and expand it. The pSeries code needs to know, and other platforms might too, whether we're doing a crash shutdown (ie. panicking) or a regular kexec, so add a flag for that. The pSeries implementation of kexec_cpu_down does an unregister VPA call, which tells the Hypervisor to stop writing stuff into our pacas. Without this we can get weird memory corruption bugs when we kexec, caused by the Hypervisor writing into the first kernel's pacas which happens to be somewhere interesting in the second kernel's memory. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | [PATCH] powerpc: Merge page.hMichael Ellerman2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge asm-ppc/page.h and asm-ppc64/page.h into asm-powerpc/page.h, asm-powerpc/page_32.h and asm-powerpc/page_64.h Built for PPC (common_defconfig), with ARCH=powerpc, mostly built with ARCH=ppc (other things break the build). Built and booted on P5 LPAR for PPC64 with ARCH=ppc/powerpc (pseries_defconfig). Mostly built for iSeries powerpc. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | [NETFILTER] fix leak of fragment queue at unloading nf_conntrack_ipv6Yasuyuki Kozakai2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes nf_conntrack_ipv6 free all IPv6 fragment queues at module unloading time. Also introduce a BUG_ON if we ever again have leaks in the memory accounting. Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [NETFILTER] nf_conntrack: fix possibility of infinite loop while evicting ↵Yasuyuki Kozakai2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nf_ct_frag6_queue This synchronizes nf_ct_reasm with ipv6 reassembly, and fixes a possibility of an infinite loop if CPUs evict and create nf_ct_frag6_queue in parallel. Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [NETFILTER]: fix type of sysctl variables in nf_conntrack_ipv6Yasuyuki Kozakai2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | These variables should be unsigned. This fixes sysctl handler for nf_ct_frag6_{low,high}_thresh. Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [NETFILTER]: cleanup IPv6 Netfilter KconfigYasuyuki Kozakai2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes linux 2.4 configs in comments as TODO lists. And this also move the entry of nf_conntrack to top like IPv4 Netfilter Kconfig. Based on original patch by Krzysztof Piotr Oledzki <ole@ans.pl>. Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [NETFILTER]: link 'netfilter' before ipv4Krzysztof Oledzki2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Staticaly linked nf_conntrack_ipv4 requires nf_conntrack. but currently nf_conntrack is linked after it. This changes the order of ipv4 and netfilter to fix this. Signed-off-by: Krzysztof Oledzki <olenf@ans.pl> Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [NETFILTER] nfnetlink: unconditionally require CAP_NET_ADMINHarald Welte2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch unconditionally requires CAP_NET_ADMIN for all nfnetlink messages. It also removes the per-message cap_required field, since all existing subsystems use CAP_NET_ADMIN for all their messages anyway. Patrick McHardy owes me a beer if we ever need to re-introduce this. Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [NETFILTER] nf_conntrack: Add missing code to TCP conntrack moduleKOVACS Krisztian2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like the nf_conntrack TCP code was slightly mismerged: it does not contain an else branch present in the IPv4 version. Let's add that code and make the testsuite happy. Signed-off-by: KOVACS Krisztian <hidden@balabit.hu> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [NETFILTER] ctnetlink: More thorough size checking of attributesPablo Neira Ayuso2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | Add missing size checks. Thanks Patrick McHardy for the hint. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [NETFILTER] nfnetlink: skip size check if size not specified (== 0)Pablo Neira Ayuso2005-11-14
| | | | | | | | | | | | | | | | | | | | | | | | Skip sizecheck if the size of the attribute wasn't specified, ie. zero. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | [NETFILTER] ctnetlink: use size_t to make gcc-4.x happyPablo Neira Ayuso2005-11-14
|/ / | | | | | | | | | | | | | | | | Make gcc-4.x happy. Use size_t instead of int. Thanks to Patrick McHardy for the hint. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6Linus Torvalds2005-11-13
|\ \
| * | [PCMCIA] inform user of insertion and ejection eventsDominik Brodowski2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Print out minimal information in dmesg whnever a CardBus or PCMCIA card is inserted into or ejected from a slot. This will make debugging certain types of bugs much easier, and is similar to output produced by other hotpluggable buses. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | [PCMCIA] i82365: use new platform_device helpersDominik Brodowski2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new platform_device helpers in the i82365 driver to get rid of the "device 'i823650' does not have a release() function" warning, and to solve bug #3676. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
* | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2005-11-13
|\ \ \
| * | | [ARM] 3160/1: SharpSL: Add driver for Akita specific GPIOsRichard Purdie2005-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Richard Purdie Add a driver for the extra GPIOs found on the Sharp SL-C1000 (Akita). These GPIOs are found on a Maxim MAX7310 I2C i/o expander chip. A generic GPIO driver for the MAX7310 was attempted but this mini driver is a much simpler and much more effective solution avoiding several issues and complexity the generic driver had (as discussed on LKML). The platform device is required so the device parent can be set correctly which ensures the device is one of the last to suspend and first to resume. Whilst the i2c suspend/resume calls can be influenced, nothing guarantees this is easlier/later than the subsystems the gpios are used on which are all independent of i2c (sound, irda, video/backlight etc.). Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 3159/1: SharpSL: Add PM device driver for the SL-Cx00 machines.Richard Purdie2005-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Richard Purdie Add a SharpSL PM device driver for the SL-Cxx00 machines. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 3158/1: SharpSL: Add PM device driver for the SL-C7x0 machines.Richard Purdie2005-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Richard Purdie Add a SharpSL PM device driver for the SL-C7x0 machines. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] Re-fix footbridgeRussell King2005-11-13
| | | | | | | | | | | | | | | | | | | | | | | | That's __phys_to_pfn, not __phy_to_pfn. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] Use correct IO operations for PlebRussell King2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use read/write IO operations rather than in/out, as per other SA1100 platforms. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] Fix collie for -rc1Pavel Machek2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes compilation for collie after -rc1 platform_device changes. And yes, it even boots. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 3154/1: SharpSL PM Driver updatesRichard Purdie2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Richard Purdie Updates to the SharpSL PM driver including cleanups from both Pavel Machek and myself and updates after the platform device changes to make it compile again. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 3149/1: SharpSL: Add Akita (SL-C1000) machine supportRichard Purdie2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Richard Purdie Add the core machine support for the Sharp SL-C1000 (Akita) and enable the Kconfig selection for it. Signed-off-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] Ensure sl82c105 IDE interfaces are serialized when using DMARussell King2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to reset the DMA state machine while the other channel is in use. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] Restore apparant pointless change in arch/arm/kernel/smp.cRussell King2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | Restore smp.c back to how it used to be. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] Fix broken sl82c105 DMA preventionRussell King2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must _never_ _ever_ on pain of death enable IDE DMA on SL82C105 chipsets where the southbridge revision is <= 5, otherwise data corruption will occur. Strangely this used to work, but something has changed in the upper echelons of the IDE layer to break the hosts decision to deny DMA. Let's make it crystal clear to the IDE layer that we know best. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] Fix Footbridge-based machinesRussell King2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, all these machines got broken when the PFN memory setup changes happened. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds2005-11-13
|\ \ \ \
| * | | | [SERIAL] Fix Bug 4900: S3 resume oops with irattach - Thinkpad A21mRussell King2005-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we fail to re-startup a serial port on resume, shut it down immediately and mark it as an error condition. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | | [SERIAL] sa1100_start_tx spinlock recursionFlorin Malita2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The serial core aquires the port spinlock before calling port->ops->start_tx(), so sa1100_start_tx() shouldn't try to lock it again. BUG: spinlock recursion on CPU#0, init/1 lock: c0205f20, .magic: dead4ead, .owner: init/1, .owner_cpu: 0 [<c0022cdc>] (dump_stack+0x0/0x14) [<c00dc338>] (spin_bug+0x0/0xbc) [<c00dc6b0>] (_raw_spin_lock+0x0/0x170) r8 = 00000007 r7 = C02FE0070 [<c018a2a8>] (_spin_lock_irqsave+0x0/0x24) r4 = C0205F20 [<c0112110>] (sa1100_start_tx+0x0/0x40) r4 = C038C000 [<c010ee38>] (__uart_start+0x0/0x5c) [<c010ee94>] (uart_start+0x0/0x3 [<c010f1d0>] (uart_write+0x0/0xdc) [<c00fee34>] (write_chan+0x0/0x370 Signed-off-by: Florin Malita <fmalita@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | | [SERIAL] Claim Wacom tablet device on HP tc1100 tabletBjorn Helgaas2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Claim the WACF005 device. This is the pen display pointing device on the HP Compaq tc1100 Tablet PC. More information about using this device, including using it as an X pointer device: http://www.theory.bham.ac.uk/staff/schofield/linux/tc1100/ Christopher Kemp <ck231@cam.ac.uk> did the legwork of determining that the WACF005 is really just a plain old UART and doing an initial ACPI driver (before we had PNPACPI), and David Ludlow <dave@adsllc.com> confirmed that PNPACPI + the attached patch is now sufficient: pnp: Device 00:05 activated. ttyS4 at I/O 0x300 (irq = 4) is a 16550A Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | | [SERIAL] Fix mpc52xx_uart.cAndrey Volkov2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix copy-paste bug in mpc52xx_uart.c (pdev<->dev) Signed-off-by: Andrey Volkov <avolkov@varma-el.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-30 03:44:38 -0500