Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (23 commits) [SPARC64]: virt_to_real_irq_table --> virt_irq_table [SPARC64]: virt_irq --> bucket mapping no longer necessary [SPARC64]: Kill ugly __bucket() macro. [SPARC64]: Kill ugly __irq_ino() macro. [SPARC64]: Only use bypass accesses to INO buckets. [SPARC64]: Update defconfig. [SPARC64]: Use sun4v VIRQ interfaces as intended. [SPARC64]: Allocate ivector_table dynamically. [SPARC64]: Access ivector_table[] using physical addresses. [SPARC64]: Make IVEC pointers 64-bit. [SPARC64]: Fix register usage in xor_raid_4(). [SPARC64]: Kill pci_memspace_mask. [SPARC64]: Consolidate MSI support code. [SPARC/64]: Move of_platform_driver initialisations: arch/sparc{,64}. [SPARC64]: Fix bugs in SYSV IPC handling in 64-bit processes. [SPARC/64]: Prepare to remove of_platform_driver name. [SPARC32]: Add irqflags.h to sparc32 and use it from generic code. [SPARC64]: beautify vmlinux.lds [SPARC]: beautify vmlinux.lds [SPARC64]: Enable MSI on sun4u Fire PCI-E controllers. ...
Showing
- Documentation/sparc/sbus_drivers.txt 3 additions, 1 deletionDocumentation/sparc/sbus_drivers.txt
- arch/sparc/Kconfig.debug 4 additions, 0 deletionsarch/sparc/Kconfig.debug
- arch/sparc/kernel/irq.c 6 additions, 6 deletionsarch/sparc/kernel/irq.c
- arch/sparc/kernel/of_device.c 4 additions, 1 deletionarch/sparc/kernel/of_device.c
- arch/sparc/kernel/time.c 3 additions, 1 deletionarch/sparc/kernel/time.c
- arch/sparc/kernel/vmlinux.lds.S 93 additions, 72 deletionsarch/sparc/kernel/vmlinux.lds.S
- arch/sparc64/defconfig 33 additions, 5 deletionsarch/sparc64/defconfig
- arch/sparc64/kernel/Makefile 1 addition, 0 deletionsarch/sparc64/kernel/Makefile
- arch/sparc64/kernel/auxio.c 3 additions, 1 deletionarch/sparc64/kernel/auxio.c
- arch/sparc64/kernel/entry.S 7 additions, 7 deletionsarch/sparc64/kernel/entry.S
- arch/sparc64/kernel/irq.c 267 additions, 343 deletionsarch/sparc64/kernel/irq.c
- arch/sparc64/kernel/of_device.c 4 additions, 1 deletionarch/sparc64/kernel/of_device.c
- arch/sparc64/kernel/pci.c 30 additions, 30 deletionsarch/sparc64/kernel/pci.c
- arch/sparc64/kernel/pci_fire.c 271 additions, 8 deletionsarch/sparc64/kernel/pci_fire.c
- arch/sparc64/kernel/pci_impl.h 31 additions, 1 deletionarch/sparc64/kernel/pci_impl.h
- arch/sparc64/kernel/pci_msi.c 433 additions, 0 deletionsarch/sparc64/kernel/pci_msi.c
- arch/sparc64/kernel/pci_psycho.c 0 additions, 6 deletionsarch/sparc64/kernel/pci_psycho.c
- arch/sparc64/kernel/pci_schizo.c 0 additions, 3 deletionsarch/sparc64/kernel/pci_schizo.c
- arch/sparc64/kernel/pci_sun4v.c 109 additions, 296 deletionsarch/sparc64/kernel/pci_sun4v.c
- arch/sparc64/kernel/power.c 3 additions, 1 deletionarch/sparc64/kernel/power.c
Loading
Please register or sign in to comment