aboutsummaryrefslogtreecommitdiffstats
path: root/arch
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | [ARM] 3632/1: iwmmxt: fix up argument comment for iwmmxt_task_restore()Lennert Buytenhek2006-06-241-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Lennert Buytenhek Commit d6551e884cf66de072b81f8b6d23259462c40baf forgot to update the description of what goes into r2 when calling iwmmxt_task_restore(). Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2006-06-2434-1347/+3232
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (40 commits) [SPARC64]: Update defconfig. [SPARC64]: Make auxio a real driver. [PARPORT] sunbpp: Convert to new SBUS device framework. [Documentation]: Update probing info in sbus_drivers.txt [SCSI] qlogicpti: Convert to new SBUS device framework. [SCSI] esp: Fix bug in esp_remove_common. [NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find(). [NET] myri_sbus: Kill unused next_module struct member. [NET] myri_sbus: Convert to new SBUS device layer. [NET] sunqe: Convert to new SBUS driver layer. [NET] sunbmac: Convert over to new SBUS device framework. [NET] sunlance: Convert to new SBUS driver framework. [NET] sunhme: Convert to new SBUS driver framework. [NET] sunhme: Kill __sparc__ and __sparc_v9__ ifdefs. [SCSI] sparc: Port esp to new SBUS driver layer. [SOUND] sparc: Port amd7930 to new SBUS device layer. [SBUS]: Rewrite and plug into of_device framework. [SPARC]: Port of_device layer and make ebus use it. [SPARC]: Port sparc64 in-kernel device tree code to sparc32. [SPARC64]: Add of_device layer and make ebus/isa use it. ...
| * | | [SPARC64]: Update defconfig.David S. Miller2006-06-231-1/+11
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Make auxio a real driver.David S. Miller2006-06-233-45/+74
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SBUS]: Rewrite and plug into of_device framework.David S. Miller2006-06-232-1/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I severely apologize, I was still learning how to program in C when I wrote this stuff 10 years ago... Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC]: Port of_device layer and make ebus use it.David S. Miller2006-06-233-1/+290
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC]: Port sparc64 in-kernel device tree code to sparc32.David S. Miller2006-06-235-82/+563
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Add of_device layer and make ebus/isa use it.David S. Miller2006-06-235-61/+387
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sparcspkr and power drivers are converted, to make sure it works. Eventually the SBUS device layer will use this as a sub-class. I really cannot cut loose on that bit until sparc32 is given the same infrastructure. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Expand of_*() interfaces some more.David S. Miller2006-06-231-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import some more stuff from powerpc. Add of_device_is_compatible(), and of_find_compatible_node(). Export some more of the other routines to modules. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Kill unused local vars in map_prom_timers().David S. Miller2006-06-231-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Kill off some more prom_getproperty() remnants.David S. Miller2006-06-233-31/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The remaining ones occur before we have imported the device tree. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Convert Cheetah memory controller driver to in-kernel PROM tree.David S. Miller2006-06-231-44/+25
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Convert central bus layer to in-kernel PROM device tree.David S. Miller2006-06-232-75/+74
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Kill ebus/isa range and interrupt mapping struct members.David S. Miller2006-06-232-92/+41
| | | | | | | | | | | | | | | | | | | | | | | | Unused outside of initial bus probe scan. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Use in-kernel PROM tree for EBUS and ISA.David S. Miller2006-06-236-338/+338
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Convert sparc64 PCI layer to in-kernel device tree.David S. Miller2006-06-239-105/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One thing this change pointed out was that we really should pull the "get 'local-mac-address' property" logic into a helper function all the network drivers can call. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Must run smp_setup_cpu_possible_map() after paging_init()David S. Miller2006-06-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the in-kernel PROM device tree isn't built yet, and therefore the present cpu bits don't get set properly. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Fix for Niagara memory corruption.David S. Miller2006-06-232-6/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some sun4v systems, after netboot the ethernet controller and it's DMA mappings can be left active. The net result is that the kernel can end up using memory the ethernet controller will continue to DMA into, resulting in corruption. To deal with this, we are more careful about importing IOMMU translations which OBP has left in the IO-TLB. If the mapping maps into an area the firmware claimed was free and available memory for the kernel to use, we demap instead of import that IOMMU entry. This is going to cause the network chip to take a PCI master abort on the next DMA it attempts, if it has been left going like this. All tests show that this is handled properly by the PCI layer and the e1000 drivers. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Minor bug fix to obp_read_memory().David S. Miller2006-06-231-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we end up zero'ing out the size of one of the entries, pop it out of the array completely because some code that examines these things cannot handle a zero length element properly. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Convert cpu_find_by_*() interface to in-kernel PROM device tree.David S. Miller2006-06-235-101/+101
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Add of_getintprop_default().David S. Miller2006-06-231-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This encodes a common idiomatic coding pattern used when dealing with integer properties. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Convert sun4v virtual-device layer to in-kernel PROM device tree.David S. Miller2006-06-231-69/+35
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Rate limited kernel unaligned trap logging, ala IA64.David S. Miller2006-06-231-0/+9
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Disable verbose PCI IRQ probing messages by default.David S. Miller2006-06-232-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow them to be enabled with "pci=irq_verbose" on the boot command line. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Use in-kernel OBP device tree for PCI controller probing.David S. Miller2006-06-236-379/+306
| | | | | | | | | | | | | | | | | | | | | | | | It can be pushed even further down, but this is a first step. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Add of_find_node_by_{name,type}().David S. Miller2006-06-231-0/+26
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Import OBP device tree into kernel data structures.David S. Miller2006-06-233-1/+547
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The basic framework is based on the PowerPC OF code. This code even tries to get the device addressing components correct in the full path names. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SBUS]: Start cleaning up generic sbus support layer.David S. Miller2006-06-232-1/+66
| |/ / | | | | | | | | | | | | | | | | | | In particular, move the IRQ probing out to sparc32/sparc64 arch specific code where it belongs. Signed-off-by: David S. Miller <davem@davemloft.net>
* | | Add some basic resume trace facilitiesLinus Torvalds2006-06-241-0/+7
|/ / | | | | | | | | | | | | | | | | | | Considering that there isn't a lot of hw we can depend on during resume, this is about as good as it gets. This is x86-only for now, although the basic concept (and most of the code) will certainly work on almost any platform. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [IA64] fix ia64 build (fadt_descriptor)Tony Luck2006-06-231-2/+2
| | | | | | | | | | | | | | arch/ia64/kernel/acpi.c got forgotten when include/acpi/actbl.h got a cleanup. Signed-off-by: Tony Luck <tony.luck@intel.com>
* | Auto-update from upstreamTony Luck2006-06-23313-5136/+13214
|\ \
| * | [PATCH] fix silly ARM non-EABI build errorNicolas Pitre2006-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | My bad. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] s390_hypfs filesystem: get_sb_single() fixAndrew Morton2006-06-231-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update hypfs for dhowells API changes. Cc: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Ingo Oeser <ioe-lkml@rameria.de> Cc: Joern Engel <joern@wohnheim.fh-wedel.de> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Michael Holzheu <holzheu@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | Merge branch 'release' of ↵Linus Torvalds2006-06-2311-237/+401
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (65 commits) ACPI: suppress power button event on S3 resume ACPI: resolve merge conflict between sem2mutex and processor_perflib.c ACPI: use for_each_possible_cpu() instead of for_each_cpu() ACPI: delete newly added debugging macros in processor_perflib.c ACPI: UP build fix for bugzilla-5737 Enable P-state software coordination via _PDC P-state software coordination for speedstep-centrino P-state software coordination for acpi-cpufreq P-state software coordination for ACPI core ACPI: create acpi_thermal_resume() ACPI: create acpi_fan_suspend()/acpi_fan_resume() ACPI: pass pm_message_t from acpi_device_suspend() to root_suspend() ACPI: create acpi_device_suspend()/acpi_device_resume() ACPI: replace spin_lock_irq with mutex for ec poll mode ACPI: Allow a WAN module enable/disable on a Thinkpad X60. sem2mutex: acpi, acpi_link_lock ACPI: delete unused acpi_bus_drivers_lock sem2mutex: drivers/acpi/processor_perflib.c ACPI add ia64 exports to build acpi_memhotplug as a module ACPI: asus_acpi_init(): propagate correct return value ... Manual resolve of conflicts in: arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c include/acpi/processor.h
| | * \ merge linus into release branchLen Brown2006-06-191-2/+2
| | |\ \ | | | |/
| | * | Pull bugzilla-5737 into release branchLen Brown2006-06-153-155/+386
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/x86_64/kernel/acpi/processor.c
| | | * | ACPI: UP build fix for bugzilla-5737Andrew Morton2006-04-012-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cpu_online_map doesn't exist if !CONFIG_SMP. Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Len Brown <len.brown@intel.com>
| | | * | Enable P-state software coordination via _PDCVenkatesh Pallipadi2006-02-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://bugzilla.kernel.org/show_bug.cgi?id=5737 Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | | * | P-state software coordination for speedstep-centrinoVenkatesh Pallipadi2006-02-091-66/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://bugzilla.kernel.org/show_bug.cgi?id=5737 Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | | * | P-state software coordination for acpi-cpufreqVenkatesh Pallipadi2006-02-091-88/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://bugzilla.kernel.org/show_bug.cgi?id=5737 Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | Pull trivial2 into release branchLen Brown2006-06-152-2/+4
| | |\ \ \
| | | * | | ACPI add ia64 exports to build acpi_memhotplug as a moduleKAMEZAWA Hiroyuki2006-05-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Len Brown <len.brown@intel.com>
| | | * | | ACPI: silence ia64 build warningLen Brown2006-05-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building sim_defconfig, which does not define CONFIG_ACPI arch/ia64/kernel/acpi.c:71: warning: 'acpi_madt_rev' defined but not used really acpi.c should not be built when CONFIG_ACPI=n... Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | | Pull bugzilla-5653 into release branchLen Brown2006-06-152-72/+1
| | |\ \ \ \
| | | * | | | [ACPI] enable SMP C-states on x86_64David Shaohua Li2006-02-092-72/+1
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://bugzilla.kernel.org/show_bug.cgi?id=5653 Signed-off-by: David Shaohua Li <shaohua.li@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | | Pull novell-bugzilla-156426 into release branchLen Brown2006-06-151-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/i386/kernel/acpi/boot.c
| | | * | | | [ACPI] fix "nolapic" flag in ACPI modeAndi Kleen2006-03-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | | | Pull Kconfig into release branchLen Brown2006-06-152-0/+2
| | |\ \ \ \ \
| | | * | | | | ACPI: Kconfig: ACPI should depend on, not select PCIAdrian Bunk2006-04-012-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, illegal configurations like X86_VOYAGER=y, PCI=y are possible. This patch also fixes the options select'ing ACPI to also select PCI. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Len Brown <len.brown@intel.com>
| | * | | | | | Pull acpica into release branchLen Brown2006-06-152-3/+3
| | |\ \ \ \ \ \
generated by cgit v1.1 at 2025-02-14 08:12:51 +0000