x86, earlyprintk: move mrst early console to platform/ and fix a typo
PATCH 1/2 x86, earlyprintk: move mrst early console to platform/ and fix a typo
Move the code to arch/x86/platform/mrst/. Also fix a typo to use the correct config option: ONFIG_EARLY_PRINTK_MRST
--- arch/x86/kernel/Makefile | 1 - arch/x86/kernel/early_printk.c | 3 +- arch/x86/kernel/early_printk_mrst.c | 319 ---------------------------- arch/x86/platform/mrst/Makefile | 1 + arch/x86/platform/mrst/early_printk_mrst.c | 319 ++++++++++++++++++++++++++++ 5 files changed, 321 insertions(+), 322 deletions(-) delete mode 100644 arch/x86/kernel/early_printk_mrst.c create mode 100644 arch/x86/platform/mrst/early_printk_mrst.c
arch/x86/kernel/Makefile +0 -1
@@ -84,7 +84,6 @@ obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_VM86) += vm86_32.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o -obj-$(CONFIG_EARLY_PRINTK_MRST) += early_printk_mrst.o obj-$(CONFIG_HPET_TIMER) += hpet.o obj-$(CONFIG_APB_TIMER) += apb_timer.o
arch/x86/kernel/early_printk.c +1 -2
@@ -240,7 +240,7 @@ static int __init setup_early_printk(char *buf)if (!strncmp (buf,"xen" ,3 ))early_console_register (&xenboot_console, keep);#endif -#ifdef CONFIG_X86_MRST_EARLY_PRINTK +#ifdef CONFIG_EARLY_PRINTK_MRST if (!strncmp (buf,"mrst" ,4 )) {mrst_early_console_init ();early_console_register (&early_mrst_console, keep);
@@ -250,7 +250,6 @@ static int __init setup_early_printk(char *buf)hsu_early_console_init (); early_console_register(&early_hsu_console, keep); } -#endif buf++; }
arch/x86/kernel/early_printk_mrst.c deleted +0 -319
319 lines not on this page · raw message
arch/x86/platform/mrst/Makefile +1 -0
@@ -1 +1,2 @@ obj-$(CONFIG_X86_MRST) += mrst.o +obj-$(CONFIG_EARLY_PRINTK_MRST) += early_printk_mrst.o
arch/x86/platform/mrst/early_printk_mrst.c new file +319 -0
319 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 2/2 x86, apbt: setup affinity for apb timers acting as per-cpu timer
Commit a5ef2e70 "x86: Sanitize apb timer interrupt handling" forgot the affinity setup when cleaning up the code, this patch just adds the forgotten part
--- arch/x86/kernel/apb_timer.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/x86/kernel/apb_timer.c +1 -0
@@ -315,6 +315,7 @@ static void apbt_setup_irq(struct apbt_dev *adev)if (system_state ==SYSTEM_BOOTING ) {irq_modify_status (adev->irq,0 ,IRQ_MOVE_PCNTXT ); +irq_set_affinity (adev->irq,cpumask_of (adev->cpu));/* APB timer irqs are set up as mp_irqs, timer is edge type */ __set_irq_handler (adev->irq, handle_edge_irq,0 ,"edge" ); if (request_irq(adev->irq, apbt_interrupt_handler,
Signature · 1 line
1.7.0.4
[tip:x86/platform] x86, apbt: Setup affinity for apb timers acting as per-cpu timer
Commit-ID: e4d2ebcab11b308b5b59073578efd33eccd55d46 Gitweb: http://git.kernel.org/tip/e4d2ebcab11b308b5b59073578efd33eccd55d46 Author: Feng Tang <[email protected]> AuthorDate: Fri, 3 Dec 2010 11:51:38 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 6 Dec 2010 15:58:26 +0100
x86, apbt: Setup affinity for apb timers acting as per-cpu timer
Commit a5ef2e70 "x86: Sanitize apb timer interrupt handling" forgot the affinity setup when cleaning up the code, this patch just adds the forgotten part
LKML-Reference: <[email protected]>
--- arch/x86/kernel/apb_timer.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/x86/kernel/apb_timer.c +1 -0
@@ -315,6 +315,7 @@ static void apbt_setup_irq(struct apbt_dev *adev)if (system_state ==SYSTEM_BOOTING ) {irq_modify_status (adev->irq,0 ,IRQ_MOVE_PCNTXT ); +irq_set_affinity (adev->irq,cpumask_of (adev->cpu));/* APB timer irqs are set up as mp_irqs, timer is edge type */ __set_irq_handler (adev->irq, handle_edge_irq,0 ,"edge" ); if (request_irq(adev->irq, apbt_interrupt_handler,
[tip:x86/platform] x86, earlyprintk: Move mrst early console to platform/ and fix a typo
In reply to Feng TangCommit-ID: 1ec1fe231814ec4af374b4b32ccc510fcba2e7a8 Gitweb: http://git.kernel.org/tip/1ec1fe231814ec4af374b4b32ccc510fcba2e7a8 Author: Feng Tang <[email protected]> AuthorDate: Fri, 3 Dec 2010 11:51:37 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 6 Dec 2010 15:58:27 +0100
x86, earlyprintk: Move mrst early console to platform/ and fix a typo
Move the code to arch/x86/platform/mrst/. Also fix a typo to use the correct config option: ONFIG_EARLY_PRINTK_MRST
LKML-Reference: <[email protected]>
---
arch/x86/kernel/Makefile | 1 -
arch/x86/kernel/early_printk.c | 3 +--
arch/x86/platform/mrst/Makefile | 1 +
.../{kernel => platform/mrst}/early_printk_mrst.c | 0
4 files changed, 2 insertions(+), 3 deletions(-)arch/x86/kernel/Makefile +0 -1
@@ -84,7 +84,6 @@ obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_VM86) += vm86_32.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o -obj-$(CONFIG_EARLY_PRINTK_MRST) += early_printk_mrst.o obj-$(CONFIG_HPET_TIMER) += hpet.o obj-$(CONFIG_APB_TIMER) += apb_timer.o
arch/x86/kernel/early_printk.c +1 -2
@@ -240,7 +240,7 @@ static int __init setup_early_printk(char *buf)if (!strncmp (buf,"xen" ,3 ))early_console_register (&xenboot_console, keep);#endif -#ifdef CONFIG_X86_MRST_EARLY_PRINTK +#ifdef CONFIG_EARLY_PRINTK_MRST if (!strncmp (buf,"mrst" ,4 )) {mrst_early_console_init ();early_console_register (&early_mrst_console, keep);
@@ -250,7 +250,6 @@ static int __init setup_early_printk(char *buf)hsu_early_console_init (); early_console_register(&early_hsu_console, keep); } -#endif buf++; }
arch/x86/platform/mrst/Makefile +1 -0
@@ -1,2 +1,3 @@ obj-$(CONFIG_X86_MRST) += mrst.o obj-$(CONFIG_X86_MRST) += vrtc.o +obj-$(CONFIG_EARLY_PRINTK_MRST) += early_printk_mrst.o
arch/x86/platform/mrst/early_printk_mrst.c renamed from arch/x86/kernel/early_printk_mrst.c +0 -0
[tip:x86/platform] x86, earlyprintk: Move mrst early console to platform/ and fix a typo
In reply to Feng TangCommit-ID: 991cfffa7c19aa648546aff666595af896e568ba Gitweb: http://git.kernel.org/tip/991cfffa7c19aa648546aff666595af896e568ba Author: Feng Tang <[email protected]> AuthorDate: Fri, 3 Dec 2010 11:51:37 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 6 Dec 2010 20:52:04 +0100
x86, earlyprintk: Move mrst early console to platform/ and fix a typo
Move the code to arch/x86/platform/mrst/. Also fix a typo to use the correct config option: ONFIG_EARLY_PRINTK_MRST
LKML-Reference: <[email protected]>
---
arch/x86/kernel/Makefile | 1 -
arch/x86/kernel/early_printk.c | 3 +--
arch/x86/platform/mrst/Makefile | 1 +
.../{kernel => platform/mrst}/early_printk_mrst.c | 0
4 files changed, 2 insertions(+), 3 deletions(-)arch/x86/kernel/Makefile +0 -1
@@ -84,7 +84,6 @@ obj-$(CONFIG_DOUBLEFAULT) += doublefault_32.o obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_VM86) += vm86_32.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o -obj-$(CONFIG_EARLY_PRINTK_MRST) += early_printk_mrst.o obj-$(CONFIG_HPET_TIMER) += hpet.o obj-$(CONFIG_APB_TIMER) += apb_timer.o
arch/x86/kernel/early_printk.c +1 -2
@@ -240,7 +240,7 @@ static int __init setup_early_printk(char *buf)if (!strncmp (buf,"xen" ,3 ))early_console_register (&xenboot_console, keep);#endif -#ifdef CONFIG_X86_MRST_EARLY_PRINTK +#ifdef CONFIG_EARLY_PRINTK_MRST if (!strncmp (buf,"mrst" ,4 )) {mrst_early_console_init ();early_console_register (&early_mrst_console, keep);
@@ -250,7 +250,6 @@ static int __init setup_early_printk(char *buf)hsu_early_console_init (); early_console_register(&early_hsu_console, keep); } -#endif buf++; }
arch/x86/platform/mrst/Makefile +1 -0
@@ -1,2 +1,3 @@ obj-$(CONFIG_X86_MRST) += mrst.o obj-$(CONFIG_X86_MRST) += vrtc.o +obj-$(CONFIG_EARLY_PRINTK_MRST) += early_printk_mrst.o