Menu
▾
▴
[LV-k25-commit] Linux for the VAX architecture: Changes to 'master'
|
From: Jan-Benedict G. <jb...@he...> - 2006-11-02 07:07:18
|
arch/mips/kernel/asm-offsets.c | 2 +- arch/mips/kernel/entry.S | 3 +++ arch/mips/kernel/head.S | 3 ++- arch/mips/kernel/r4k_switch.S | 5 +++++ arch/mips/kernel/smtc-asm.S | 7 ++++++- arch/mips/kernel/smtc.c | 1 + arch/mips/kernel/vmlinux.lds.S | 10 ++++++++++ arch/mips/lib-64/dump_tlb.c | 6 +++--- arch/mips/mips-boards/generic/memory.c | 2 +- arch/mips/mips-boards/generic/pci.c | 2 +- arch/mips/mm/pg-r4k.c | 30 ++++++++++++++++++++++++++++-- arch/mips/mm/tlbex.c | 13 ++++++++++--- arch/powerpc/kernel/head_64.S | 27 +++++++++++++++------------ drivers/ata/ahci.c | 3 +-- drivers/ata/ata_piix.c | 1 - drivers/ata/sata_nv.c | 12 ++++++++---- include/asm-mips/asm.h | 2 ++ include/asm-mips/pgalloc.h | 2 +- include/asm-mips/pgtable-64.h | 2 +- 19 files changed, 99 insertions(+), 34 deletions(-) New commits: commit aefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=aefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=aefba081d7b7dfd1c5752f6e6e709d8b5ab80ab7 Merge: 3ccfc65c5004e5fe5cfbffe43b8acc686680b53e 732f74a46711c0724885703fb689c79139c84a3c Author: Linus Torvalds <tor...@g5...> Date: Wed Nov 1 19:16:31 2006 -0800 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: Revert "[PATCH] Add 0x7110 piix to ata_piix.c" [libata] sata_nv: Add PCI IDs [PATCH] ahci: fix status register check in ahci_softreset commit 732f74a46711c0724885703fb689c79139c84a3c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=732f74a46711c0724885703fb689c79139c84a3c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=732f74a46711c0724885703fb689c79139c84a3c Author: Jeff Garzik <je...@ga...> Date: Wed Nov 1 22:09:21 2006 -0500 Revert "[PATCH] Add 0x7110 piix to ata_piix.c" This reverts commit f833229c96c0bf53c05995e4bd58709d9e9edd67: According to reviewers and the lspci data provided in commit message itself, PCI ID 0x7110 should not have been added to ata_piix. Signed-off-by: Jeff Garzik <je...@ga...> commit 3ccfc65c5004e5fe5cfbffe43b8acc686680b53e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=3ccfc65c5004e5fe5cfbffe43b8acc686680b53e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=3ccfc65c5004e5fe5cfbffe43b8acc686680b53e Author: Paul Mackerras <pa...@sa...> Date: Thu Nov 2 09:44:37 2006 +1100 [PATCH] powerpc: Eliminate "exceeds stub group size" linker warning It turns out that the linker warnings on 64-bit powerpc about "section blah exceeds stub group size" were being triggered by conditional branches in head_64.S branching to global symbols, whether in head_64.S or in other files. This eliminates the warnings by making some global symbols in head_64.S no longer global, and by rearranging some branches. Signed-off-by: Paul Mackerras <pa...@sa...> [ Yee-haa. Maybe I'll notice newly introduced real warnings now - Linus ] Signed-off-by: Linus Torvalds <tor...@os...> commit dd472546edefe0d48613c466b110533514e20455 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=dd472546edefe0d48613c466b110533514e20455 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=dd472546edefe0d48613c466b110533514e20455 Merge: f9dadfa71bc594df09044da61d1c72701121d802 67cac1eba7eee92e2b25c1e8e4737968dc7c8522 Author: Linus Torvalds <tor...@g5...> Date: Wed Nov 1 12:00:22 2006 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Fix warning in mips-boards generic PCI [MIPS] SMTC: Synchronize cp0 counters on bootup. [MIPS] SMTC: Fix crash if # of TC's > # of VPE's after pt_regs irq cleanup. [MIPS] 16K & 64K page size fixes commit 67cac1eba7eee92e2b25c1e8e4737968dc7c8522 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=67cac1eba7eee92e2b25c1e8e4737968dc7c8522 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=67cac1eba7eee92e2b25c1e8e4737968dc7c8522 Author: Yoichi Yuasa <yoi...@tr...> Date: Wed Nov 1 18:55:22 2006 +0900 [MIPS] Fix warning in mips-boards generic PCI arch/mips/mips-boards/generic/pci.c: In function `mips_pcibios_init': arch/mips/mips-boards/generic/pci.c:227: warning: comparison of distinct pointer types lacks a cast arch/mips/mips-boards/generic/pci.c:228: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Yoichi Yuasa <yoi...@tr...> Signed-off-by: Ralf Baechle <ra...@li...> commit 64c590b7a62ae1272fe4afd7b915de314591f35e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=64c590b7a62ae1272fe4afd7b915de314591f35e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=64c590b7a62ae1272fe4afd7b915de314591f35e Author: Ralf Baechle <ra...@li...> Date: Wed Nov 1 00:22:00 2006 +0000 [MIPS] SMTC: Synchronize cp0 counters on bootup. Signed-off-by: Ralf Baechle <ra...@li...> commit cb56837ea5f15fa5279fd490f292134c3a92e5de gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cb56837ea5f15fa5279fd490f292134c3a92e5de gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cb56837ea5f15fa5279fd490f292134c3a92e5de Author: Ralf Baechle <ra...@li...> Date: Tue Oct 31 22:49:04 2006 +0000 [MIPS] SMTC: Fix crash if # of TC's > # of VPE's after pt_regs irq cleanup. Signed-off-by: Ralf Baechle <ra...@li...> commit 242954b5aa8e5ec84f46a84637daf08ee4247c6e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=242954b5aa8e5ec84f46a84637daf08ee4247c6e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=242954b5aa8e5ec84f46a84637daf08ee4247c6e Author: Ralf Baechle <ra...@li...> Date: Tue Oct 24 02:29:01 2006 +0100 [MIPS] 16K & 64K page size fixes Derived from Peter Watkins <tre...@gm...>'s work. Signed-off-by: Ralf Baechle <ra...@li...> commit 8fc2d9cae99e47e236cb7b77015b9faf69a097cc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=8fc2d9cae99e47e236cb7b77015b9faf69a097cc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=8fc2d9cae99e47e236cb7b77015b9faf69a097cc Author: Peer Chen <pc...@nv...> Date: Wed Nov 1 05:23:11 2006 -0500 [libata] sata_nv: Add PCI IDs Signed-off-by: Jeff Garzik <je...@ga...> commit 1244a19cde42c268aa159d264fc2df072a3ff82f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1244a19cde42c268aa159d264fc2df072a3ff82f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1244a19cde42c268aa159d264fc2df072a3ff82f Author: Tejun Heo <ht...@gm...> Date: Wed Nov 1 17:19:18 2006 +0900 [PATCH] ahci: fix status register check in ahci_softreset ahci_softreset() used to use ahci_tf_read() which reads D2H_REG area to check for the Status register. However, this area is zeroed on initialization and not set by initial signature FIS. Replace it with ahci_check_status(). This bug prevented CLO code from being activated whenever BSY and/or DRQ is set prior to softreset. This fix makes AHCI_FLAG_RESET_NEEDS_CLO flag redundant. Signed-off-by: Tejun Heo <ht...@gm...> Signed-off-by: Jeff Garzik <je...@ga...> |
