summaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ↵Linus Torvalds2007-10-2055-1629/+6329
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hera.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6 * 'master' of hera.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (29 commits) [PARISC] fix uninitialized variable warning in asm/rtc.h [PARISC] Port checkstack.pl to parisc [PARISC] Make palo target work when $obj != $src [PARISC] Zap unused variable warnings in pci.c [PARISC] Fix tests in palo target [PARISC] Fix palo target [PARISC] Restore palo target [PARISC] Attempt to clean up parisc/Makefile [PARISC] Fix infinite loop in /proc/iomem [PARISC] Quiet sysfs_create_link __must_check warnings in pdc_stable [PARISC] Squelch pci_enable_device __must_check warning in superio [PARISC] Kill off broken irqstack code [PARISC] Remove hardcoded uses of PAGE_SIZE [PARISC] Clean up pointless ASM_PAGE_SIZE_DIV use [PARISC] Kill off the last vestiges of ASM_PAGE_SIZE [PARISC] Kill off ASM_PAGE_SIZE use [PARISC] Beautify parisc vmlinux.lds.S [PARISC] Clean up a resource_size_t warning in sba_iommu [PARISC] Kill incorrect cast warning in unwinder [PARISC] Kill zone_to_nid printk warning ... Fixed trivial conflict in include/asm-parisc/tlbflush.h manually
| * [PARISC] Make palo target work when $obj != $srcKyle McMartin2007-10-201-5/+9
| | | | | | | | | | | | | | Stumbled upon when I was testing it out and using make O=... to build. Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Zap unused variable warnings in pci.cKyle McMartin2007-10-191-5/+5
| | | | | | | | | | | | | | 'bus' was basically useless and 'hba' is only applicable on 64bit. Sigh, there's got to be a cleaner way to do this... Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Fix tests in palo targetKyle McMartin2007-10-191-2/+2
| | | | | | | | Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Fix palo targetKyle McMartin2007-10-181-1/+1
| | | | | | | | | | | | Hunk missing from previous commit, oops. Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Restore palo targetKyle McMartin2007-10-181-0/+20
| | | | | | | | | | | | Turns out, people were still using it, and it accidently works. Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Attempt to clean up parisc/MakefileKyle McMartin2007-10-181-38/+24
| | | | | | | | Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Fix infinite loop in /proc/iomemMatthew Wilcox2007-10-181-32/+0
| | | | | | | | | | | | | | | | | | | | | | pcibios_link_hba_resources() could corrupt the resource tree by inserting resources in the wrong place. Fix this by calling pci_claim_resource() for PCI-PCI bridges. Delete pcibios_link_hba_resources as we shouldn't need it any more. Also get rid of lba_claim_dev_resources() and just call pci_claim_resource() directly. Signed-off-by: Matthew Wilcox <willy@linux.intel.com> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Kill off broken irqstack codeKyle McMartin2007-10-185-59/+3
| | | | | | | | | | | | | | It's been unfinished and broken long enough, and I have some ideas on how to do it more cleanly. Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Remove hardcoded uses of PAGE_SIZEKyle McMartin2007-10-185-8/+8
| | | | | | | | Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Clean up pointless ASM_PAGE_SIZE_DIV useKyle McMartin2007-10-182-6/+4
| | | | | | | | Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Kill off the last vestiges of ASM_PAGE_SIZEKyle McMartin2007-10-181-1/+1
| | | | | | | | | | | | Sam's previous patch missed a few uses of ASM_PAGE_SIZE. Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Kill off ASM_PAGE_SIZE useSam Ravnborg2007-10-183-13/+13
| | | | | | | | | | | | | | | | | | | | | | We have the macro _AC() generally available now so the calculation of PAGE_SIZE can be made assembler compatible. Introduce use of _AC() and kill all users of ASM_PAGE_SIZE. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Beautify parisc vmlinux.lds.SSam Ravnborg2007-10-181-134/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a consistent layout of vmlinux. The same layout has been introduced for most architectures. And the same time move a few label definitions inside the curly brackets so they are assigned the correct starting address. Before a ld inserted alignment would have casued the label to pint before the actual start of the section. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Kill incorrect cast warning in unwinderKyle McMartin2007-10-181-2/+2
| | | | | | | | Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Kill zone_to_nid printk warningKyle McMartin2007-10-181-1/+1
| | | | | | | | | | | | zone_to_nid returns int, always. Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Unbreak processor_probe when we have more than NR_CPUSKyle McMartin2007-10-181-1/+6
| | | | | | | | | | | | | | | | If we already have NR_CPUS worth of cpus online, we obviously shouldn't be trying to bring up more... Fixes a particularly vexing issue I had when running another machines kernel on my rp3440. Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Kill pointless variable use in time.cKyle McMartin2007-10-181-4/+2
| | | | | | | | | | | | | | Clean up a pointless use of a variable in update_cr16_clocksource. It just looks silly. Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] import necessary bits of libgcc.aKyle McMartin2007-10-1831-24/+4628
| | | | | | | | | | | | | | | | | | Currently we're hacking libs-y to include libgcc.a, but this has unforeseen consequences since the userspace libgcc is linked with fpregs enabled. We need the kernel to stop using fpregs in an uncontrolled manner to implement lazy fpu state saves. Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Use page allocator instead of slab allocator in pci-dma.cChristoph Lameter2007-10-181-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slab pages obtained via kmalloc are not cacheline aligned. Nor is it advisable to perform VM operations designed for page allocator pages on memory obtained via kmalloc. So replace the page sized allocations in kernel/pci-dma.c with page allocator pages. Signed-off-by: Christoph Lameter <clameter@sgi.com> Cc: Hugh Dickins <hugh@veritas.com> Cc: Grant Grundler <grundler@parisc-linux.org> Cc: Matthew Wilcox <willy@debian.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] parisc: "extern inline" -> "static inline"Adrian Bunk2007-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | "extern inline" will have different semantics with gcc 4.3, and "static inline" is correct here. Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: Matthew Wilcox <willy@debian.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Update defconfigsKyle McMartin2007-10-185-1324/+1439
| | | | | | | | Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| * [PARISC] Wire up sys_fallocate (and compat_sys_fallocate)Kyle McMartin2007-10-182-0/+8
| | | | | | | | Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
* | kbuild: restore arch/{ppc/xtensa}/boot cflagsMilton Miller2007-10-202-1/+4
| | | | | | | | | | | | | | | | | | | | | | Commit 9a39e273d4df0560c724c5fe71f6314a0583ca2b removed the boot directory addition to CFLAGS that was being used by the subdirectory builds. For the other files, that patch set EXTRA_CFLAGS, but Makefile.build explicitly sets that to empty as it is explicitly for a single directory only. Append to KBUILD_CFLAGS instead. Signed-off-by: Milton Miller <miltonm@bga.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivialLinus Torvalds2007-10-19171-291/+291
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits) fix do_sys_open() prototype sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake Documentation: Fix typo in SubmitChecklist. Typo: depricated -> deprecated Add missing profile=kvm option to Documentation/kernel-parameters.txt fix typo about TBI in e1000 comment proc.txt: Add /proc/stat field small documentation fixes Fix compiler warning in smount example program from sharedsubtree.txt docs/sysfs: add missing word to sysfs attribute explanation documentation/ext3: grammar fixes Documentation/java.txt: typo and grammar fixes Documentation/filesystems/vfs.txt: typo fix include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros trivial copy_data_pages() tidy up Fix typo in arch/x86/kernel/tsc_32.c file link fix for Pegasus USB net driver help remove unused return within void return function Typo fixes retrun -> return x86 hpet.h: remove broken links ...
| * | small documentation fixesPhilipp Marek2007-10-201-2/+2
| | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | Fix typo in arch/x86/kernel/tsc_32.cJosh Triplett2007-10-201-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Josh Triplett <josh@kernel.org> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | typo fixesMatt LaPlante2007-10-208-45/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of these fixes were already submitted for old kernel versions, and were approved, but for some reason they never made it into the releases. Because this is a consolidation of a couple old missed patches, it touches both Kconfigs and documentation texts. Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | spelling fixes: arch/x86_64/Simon Arlott2007-10-209-13/+13
| | | | | | | | | | | | | | | | | | | | | Spelling fixes in arch/x86_64/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | spelling fixes: arch/v850/Simon Arlott2007-10-202-4/+4
| | | | | | | | | | | | | | | | | | | | | Spelling fixes in arch/v850/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | spelling fixes: arch/um/Simon Arlott2007-10-209-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Spelling fixes in arch/um/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Acked-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | spelling fixes: arch/m68k/Simon Arlott2007-10-208-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | Spelling fixes in arch/m68k/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | spelling fixes: arch/m32r/Simon Arlott2007-10-205-15/+15
| | | | | | | | | | | | | | | | | | | | | Spelling fixes in arch/m32r/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | spelling fixes: arch/i386/Simon Arlott2007-10-2037-57/+57
| | | | | | | | | | | | | | | | | | | | | Spelling fixes in arch/i386/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | spelling fixes: arch/h8300/Simon Arlott2007-10-204-4/+4
| | | | | | | | | | | | | | | | | | | | | Spelling fixes in arch/h8300/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | spelling fixes: arch/frv/Simon Arlott2007-10-203-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Spelling fixes in arch/frv/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Acked-By: David Howells <dhowells@redhat.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | spelling fixes: arch/cris/Simon Arlott2007-10-2026-42/+42
| | | | | | | | | | | | | | | | | | | | | Spelling fixes in arch/cris/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | spelling fixes: arch/alpha/Simon Arlott2007-10-2010-10/+9
| | | | | | | | | | | | | | | | | | | | | Spelling fixes in arch/alpha/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | H8300: Typo: "buildin" -> "builtin"Robert P. J. Day2007-10-201-3/+3
| | | | | | | | | | | | | | | Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | XTENSA: Emphasize that the "eth" boot-time parm takes a valueRobert P. J. Day2007-10-201-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | BOOT: Show that no_ipi_broadcast() takes a parameter.Robert P. J. Day2007-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a rather obvious fix given the opening of the function: ... static __init int no_ipi_broadcast(char *str) { get_option(&str, &no_broadcast); ... Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | Spelling fix: explicitlyJean Delvare2007-10-196-7/+7
| | | | | | | | | | | | | | | | | | | | | From: Jean Delvare <khali@linux-fr.org> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | more UTF-8 conversionsMarcin Garski2007-10-191-1/+1
| | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | Convert files to UTF-8 and some cleanupsJan Engelhardt2007-10-1928-46/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Convert files to UTF-8. * Also correct some people's names (one example is Eißfeldt, which was found in a source file. Given that the author used an ß at all in a source file indicates that the real name has in fact a 'ß' and not an 'ss', which is commonly used as a substitute for 'ß' when limited to 7bit.) * Correct town names (Goettingen -> Göttingen) * Update Eberhard Mönkeberg's address (http://lkml.org/lkml/2007/1/8/313) Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * | Fix misspellings of "system", "controller", "interrupt" and "necessary".Robert P. J. Day2007-10-1914-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | Fix the various misspellings of "system", controller", "interrupt" and "[un]necessary". Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
* | | Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86Linus Torvalds2007-10-1970-635/+630
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (33 commits) x86: convert cpuinfo_x86 array to a per_cpu array x86: introduce frame_pointer() and stack_pointer() x86 & generic: change to __builtin_prefetch() i386: do not BUG_ON() when MSR is unknown x86: acpi use cpu_physical_id x86: convert cpu_llc_id to be a per cpu variable x86: convert cpu_to_apicid to be a per cpu variable i386: introduce "used_vectors" bitmap which can be used to reserve vectors. x86: use raw locks during oopses x86: honor _PAGE_PSE bit on page walks i386: do cpuid_device_create() in CPU_UP_PREPARE instead of CPU_ONLINE. x86: implement missing x86_64 function smp_call_function_mask() x86: use descriptor's functions instead of inline assembly i386: consolidate show_regs and show_registers for i386 i386: make callgraph use dump_trace() on i386/x86_64 x86: enable iommu_merge by default i386: i386 add AMD64 Barcelona PMU MSR definitions to msr.h x86: Unify i386 and x86-64 early quirks x86: enable HPET on ICH3 and ICH4 x86: force enable HPET on VT8235/8237 chipsets ... Manually fix trivial conflict with task pid container helper changes in arch/x86/kernel/process_32.c
| * | x86: convert cpuinfo_x86 array to a per_cpu arrayMike Travis2007-10-1931-110/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cpu_data is currently an array defined using NR_CPUS. This means that we overallocate since we will rarely really use maximum configured cpus. When NR_CPU count is raised to 4096 the size of cpu_data becomes 3,145,728 bytes. These changes were adopted from the sparc64 (and ia64) code. An additional field was added to cpuinfo_x86 to be a non-ambiguous cpu index. This corresponds to the index into a cpumask_t as well as the per_cpu index. It's used in various places like show_cpuinfo(). cpu_data is defined to be the boot_cpu_data structure for the NON-SMP case. Signed-off-by: Mike Travis <travis@sgi.com> Acked-by: Christoph Lameter <clameter@sgi.com> Cc: Andi Kleen <ak@suse.de> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: Dmitry Torokhov <dtor@mail.ru> Cc: "Antonino A. Daplas" <adaplas@pol.net> Cc: Mark M. Hoffman <mhoffman@lightlink.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| * | x86: introduce frame_pointer() and stack_pointer()Jan Blunck2007-10-191-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch defines frame_pointer() and stack_pointer() similar to the already defined instruction_pointer(). Thus the oprofile code can be written in a more readable fashion. [ tglx: arch/x86 adaptation ] Signed-off-by: Jan Blunck <jblunck@suse.de> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| * | i386: do not BUG_ON() when MSR is unknownStephane Eranian2007-10-191-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here is a small patch to change the behavior of the PMU msr allocator to avoid BUG_ON() when the MSR is unknwon. Instead, it now returns ok, which means "I do not manage". The current allocator is not yet managing the full set of PMU registers (e.g., GLOBAL_* on Core 2). [watchdog] do not BUG_ON() in the MSR allocator if MSR is unknown, return ok instead Signed-off-by: Stephane Eranian <eranian@hpl.hp.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| * | x86: acpi use cpu_physical_idMike Travis2007-10-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is from an earlier message from Christoph Lameter: processor_core.c currently tries to determine the apicid by special casing for IA64 and x86. The desired information is readily available via cpu_physical_id() on IA64, i386 and x86_64. Signed-off-by: Christoph Lameter <clameter@sgi.com> Additionally, boot_cpu_id needed to be exported to fix compile errors in dma code when !CONFIG_SMP. Signed-off-by: Mike Travis <travis@sgi.com> Cc: Andi Kleen <ak@suse.de> Cc: Christoph Lameter <clameter@sgi.com> Cc: "Siddha, Suresh B" <suresh.b.siddha@intel.com> Cc: Len Brown <lenb@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
OpenPOWER on IntegriCloud