aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [PATCH] sh: I/O routine cleanups and ioremap() overhaulPaul Mundt2006-01-17
| | | | | | | | | | | | | | | | | This introduces a few changes in the way that the I/O routines are defined on SH, specifically so that things like the iomap API properly wrap through the machvec for board-specific quirks. In addition to this, the old p3_ioremap() work is converted to a more generic __ioremap() that will map through the PMB if it's available, or fall back on page tables for everything else. An alpha-like IO_CONCAT is also added so we can start to clean up the board-specific io.h mess, which will be handled in board update patches.. Signed-off-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] sh: IRQ handler updatesPaul Mundt2006-01-17
| | | | | | | | | | | | | | This moves the various IRQ controller drivers into a new subdirectory, and also extends the INTC2 IRQ handler to also deal with SH7760 and SH7780 interrupts, rather than just ST-40. The old CONFIG_SH_GENERIC has also been removed from the IRQ definitions, as new ports are expected to be based off of CONFIG_SH_UNKNOWN. Since there are plenty of incompatible machvecs, CONFIG_SH_GENERIC doesn't make sense anymore. Signed-off-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] sh: kexec() supportkogiidena2006-01-17
| | | | | | | | | | This adds kexec() support for SH. Signed-off-by: kogiidena <kogiidena@eggplant.ddo.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org> Cc: <fastboot@lists.osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] sh: DMA updatesPaul Mundt2006-01-17
| | | | | | | | | | | | | This extends the current SH DMA API somewhat to support a proper virtual channel abstraction, and also works to represent this through the driver model by giving each DMAC its own platform device. There's also a few other minor changes to support a few new CPU subtypes, and make TEI generation for the SH DMAC configurable. Signed-off-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] sh: consolidate hp620/hp680/hp690 targets into hp6xxPaul Mundt2006-01-17
| | | | | | | | | | | Most of the reasons for keeping these separate before was due to hp690 discontig, and since we have a workaround for that now (abusing some shadow space so everything is magically contiguous), there's no reason to keep the targets separate. Signed-off-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] fix up sbuslib for new fb_comapt_ioctl prototypeChristoph Hellwig2006-01-17
| | | | | | | | | | | | After ages my fb ioctl prototype cleanup finally got in. Unfortunately the patch are so old that the sbus compat_ioctl helper didn't exist back then, so it's not covered. This patch should fix that issue. Signed-off-by: Christoph Hellwig <hch@lst.de> Cc: "David S. Miller" <davem@davemloft.net> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] arm26: s/task_threas_info/task_thread_info/Alexey Dobriyan2006-01-17
| | | | | | | Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Ian Molton <spyro@f2s.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] mips: add pm_power_offYoichi Yuasa2006-01-17
| | | | | | | | | Adds pm_power_off() to MIPS. Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] drivers/char/esp.c spinlock fixIngo Molnar2006-01-17
| | | | | | | | | | There's incorrect spinlock usage in espserial_init(): autoconfig() uses info->lock before it's initialized. The fix is to initialize the spinlock earlier. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] build kernel/intermodule.c only when requiredAdrian Bunk2006-01-17
| | | | | | | | | | Build kernel/intermodule.c only when required. Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] no longer mark MTD_OBSOLETE_CHIPS as BROKENAdrian Bunk2006-01-17
| | | | | | | | | | This patch removes the wrong dependency of MTD_OBSOLETE_CHIPS on BROKEN and marks the non-compiling MTD_AMDSTD and MTD_JEDEC drivers as BROKEN. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] arm26: kernel/irq.c: fix compilationAlexey Dobriyan2006-01-17
| | | | | | | | | It's trying to "continue;" in "if" statement. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Acked-by: Ian Molton <spyro@f2s.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] arm26: add L1_CACHE_SHIFTAlexey Dobriyan2006-01-17
| | | | | | | | | Fix reiserfs compilation as a side effect =) Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Acked-by: Ian Molton <spyro@f2s.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] fix arm26 THREAD_SIZEAdrian Bunk2006-01-17
| | | | | | | | | | | | | | | | | | | | | | | | | arm26 currently has a 256 kB THREAD_SIZE (sic). Looking at the comment in the code, this seems to be based on a misunderstanding. The comment says: this needs attention (see kernel/fork.c which gets a nice div by zero if this is lower than 8*32768 kernel/fork.c does: max_threads = mempages / (8 * THREAD_SIZE / PAGE_SIZE) Therefore, a division by 0 is impossible for all reasonable cases with THREAD_SIZE >= PAGE_SIZE. Since the minimum PAGE_SIZE Linux uses on the arm26 architecture is 16k, PAGE_SIZE should be sufficient for THREAD_SIZE. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Ian Molton <spyro@f2s.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] i386: remove gcc version check for CONFIG_REGPARMAdrian Bunk2006-01-17
| | | | | | | | | | Since we do no longer support any gcc < 3.0, there's no need to check for it.. Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge branch 'release' of ↵Linus Torvalds2006-01-16
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
| * Pull perfmon-montecito into release branchTony Luck2006-01-16
| |\
| | * [IA64] Perfmon for MontecitoStephane Eranian2006-01-16
| | | | | | | | | | | | | | | | | | | | | Add Montecito PMU description table for perfmon2 Signed-off-by: Stephane Eranian <eranian@hpl.hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
| * | [IA64] Cleanup of arch/ia64/sn and include/asm-ia64/snPrarit Bhargava2006-01-16
| | | | | | | | | | | | | | | | | | | | | | | | Replace uintX_t declarations with uX declarations. Replace intX_t declarations with sX declarations. Signed-off-by: Prarit Bhargava <prarit@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
| * | [IA64] pal cache flush patchXu, Anthony2006-01-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because PAL spec has changed since 2002, you can goto http://developer.intel.com/design/itanium/manuals/iiasdmanual.htm to download new SDM, all PAL calls should be invoked with psr.ic=1, and it's caller's responsibility to handle possible tlb miss. Ia64_pal_cache_flush was written according to old spec, it is obsolete, and this patch has ia64_pal_cache_flush conform to new spec. Signed-off-by Anthony Xu <anthony.xu@intel.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
| * | [IA64] Stop multiple pci_claim_resource() call for the same resourceKenji Kaneshige2006-01-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the bug that pci_claim_resource() is called multiple times for the same P2P bridge's resource structures if P2P bridges require their own PCI I/O resources. Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
| * | [IA64] Simple memory hot-add for ia64.Yasunori Goto2006-01-16
| |/ | | | | | | | | | | | | | | | | First step to memory hotplug for ia64 (add only, all new memory is added to node 0, does not use ZONE_EASY_RECLAIM yet). Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
* | [PATCH] hrtimer comment tweakJonathan Corbet2006-01-16
| | | | | | | | | | | | | | Fix a comment which missed an update cycle somewhere. Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge git://oss.sgi.com:8090/oss/git/xfs-2.6Linus Torvalds2006-01-16
|\ \
| * | Make alloc_page_buffers() initialise buffer_heads using init_buffer(),Nathan Scott2006-01-16
| |/ | | | | | | | | | | | | | | like other routines here, to ensure buffers are correctly initialised with respect to b_private/b_end_io. Fixes an odd interaction between XFS and reiserfs. Signed-off-by: Nathan Scott <nathans@sgi.com>
* | [PATCH] Fix drivers/block/ps2esdi.c compileJens Axboe2006-01-16
| | | | | | | | Looks like fallout from the geo stuff.
* | Merge branch 'for-linus' of ↵Linus Torvalds2006-01-16
|\ \ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394
| * | Actually remove amdtp.[ch], cmp.[ch].Jody McIntyre2006-01-16
| |/ | | | | | | | | | | | | The feature removal was done in 7301c8d3a05dc52d33598364da7c4eb6ab6357eb but these files were not removed for some reason. Signed-off-by: Jody McIntyre <scjody@modernduck.com>
* | x86-64: fix initrd freeingLinus Torvalds2006-01-16
| | | | | | | | | | | | | | | | The comparison of the initrd start address against "&_end" is unnecessary and incorrect. Make it match the x86 code that just compares the passed-in arguments. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] x86_64: Increase NR_IRQ_VECTORS to 32 * NR_CPUSAndi Kleen2006-01-16
| | | | | | | | | | | | | | | | | | | | This prevents running out of GSIs on large Unisys ES7000 machines. Follows i386 Cc: "Protasevich, Natalie" <Natalie.Protasevich@unisys.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] x86_64: Don't try to put kernel page tables beyond ZONE_DMA32.Andi Kleen2006-01-16
| | | | | | | | | | | | | | | | | | | | | | For not fully explained reasons it broke mem=... on several setups. Also minor cleanup. Cc: axboe@suse.de Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] x86_64: set do_not_nx as cpuinitdataAndi Kleen2006-01-16
| | | | | | | | | | | | | | | | 'check_efer' uses 'do_not_nx'. Hotpluged CPU could wrongly disable NX. Signed-off-by: Shaohua Li<shaohua.li@intel.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] x86_64: lapic resume uses correct base addressShaohua Li2006-01-16
| | | | | | | | | | | | | | | | uses correct lapic base address. The set_fixmap appears useless. Signed-off-by: Shaohua Li<shaohua.li@intel.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] x86_64: Only let user select PM timer support when EMBEDDEDAndi Kleen2006-01-16
| | | | | | | | | | | | | | | | | | | | To avoid mistakes. I got a few reports where people got broken timing because they didn't have the PMTIMER fallback. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] x86_64: Allow nesting of int3 by default for kprobesAndi Kleen2006-01-16
| | | | | | | | | | | | | | | | | | | | | | This unbreaks recursive kprobes which didn't work anymore due to an earlier patch which converted the debug entry point to use an IST. This also allows nesting of the debug entry point too. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] x86_64: Mark powernow k8 init functions as __cpuinitAndi Kleen2006-01-16
| | | | | | | | | | | | | | | | | | | | | | | | | | cpufreq init can be called when a CPU is set online. Need to make powernow-k8's initialisation functions __cpuinit to prevents oopses when a CPU is off/onlined on a AMD system Cc: trenn@suse.de Cc: mark.langsdorf@amd.com Cc: davej@redhat.com Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuildLinus Torvalds2006-01-16
|\ \ | |/ |/|
| * kbuild: fix 'make all install_modules install'Sam Ravnborg2006-01-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The command 'make all modules_install install' would fail in a virgin tree - pointing at a non-existing directory under /lib/modules/xxx KERNELRELEASE is part of MODLIB and we need to create .kernelrelease before we can properly evaluate KERNELRELEASE, Changing MODLIB to the recursively expanded flavor let it pick up the correct KERNELRELEASE value. Reported by: "Hemmann, Volker Armin" <volker.armin.hemmann@tu-clausthal.de> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * kbuild: create .kernelrelease at *config stepSam Ravnborg2006-01-16
| | | | | | | | | | | | | | | | | | | | | | | | To enable 'make kernelrelease' earlier now create .kernelrelease when one of the *config targets are used. Also introduce KERNELVERSION - only user is kconfig. KERNELVERSION was needed to display kernel version in menuconfig - KERNELRELEASE is not valid until configuration has completed. kconfig files modified to use KERNELVERSION. Bug reported by: Rene Rebe <rene@exactcode.de> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * kbuild: fix make -jN with multiple targets with O=...Sam Ravnborg2006-01-15
| | | | | | | | | | | | | | | | | | The way multiple targets was handled with make O=... broke because for each high-level target make spawned a parallel make resulting in a broken build. Reported by Keith Owens <kaos@ocs.com.au> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| * kconfig: get rid of stray a.o, support ncurseswSam Ravnborg2006-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scripts/kconfig/lxdialog/check-lxdialog.sh uses gcc to check for what libraries are present. Redirect output to /dev/null so we do not generate an a.out. Also included support for ncursesw - so if present prefer that instead of ncurses. The order is now (first is preferred): 1) ncursesw 2) ncurses 3) curses The latter is to support SunOS. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
* | Merge git://oss.sgi.com:8090/oss/git/xfs-2.6Linus Torvalds2006-01-16
|\ \
| * | [XFS] remove no-longer-needed IS_NOATIME macro, twas just a build workaroundNathan Scott2006-01-16
| | | | | | | | | | | | | | | Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Nathan Scott <nathans@sgi.com>
| * | [XFS] mutex fallout - fix debug builds and remove no-longer-useful comment.Nathan Scott2006-01-16
| | | | | | | | | | | | Signed-off-by: Nathan Scott <nathans@sgi.com>
| * | [XFS] Fix symlink creation too, with respect to initialising SELinuxNathan Scott2006-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | context. SGI-PV: 946762 SGI-Modid: xfs-linux-melb:xfs-kern:24983a Signed-off-by: Nathan Scott <nathans@sgi.com>
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivialLinus Torvalds2006-01-15
|\ \ \ | |/ / |/| |
| * | MAINTAINERS: CIFS: add linux-cifs-client@lists.samba.org listJesper Juhl2006-01-14
| | | | | | | | | | | | | | | | | | | | | Add linux-cifs-client@lists.samba.org to CIFS entry in MAINTAINERS Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | correct email address of Manfred SpraulChristian Kujau2006-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I tried to send the forcedeth maintainer an email, but it came back with: "The mail address manfreds@colorfullife.com is not read anymore. Please resent your mail to manfred@ instead of manfreds@." This patch fixes this. Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | Spelling fix in init/Kconfig for the help of CONFIG_SWAPJesper Juhl2006-01-14
| | | | | | | | | | | | | | | | | | | | | Trivial spelling fix s/socalled/so called/ Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * | return statement cleanup - kill pointless parenthesesJesper Juhl2006-01-14
| | | | | | | | | | | | | | | | | | | | | This patch removes pointless parentheses from return statements. Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk> Signed-off-by: Adrian Bunk <bunk@stusta.de>