subject:"\[PATCH \-v11 resend 09\/11\] arm, prepare reboot_mode for moving to generic kernel code."

[PATCH -v11 resend 09/11] arm, prepare reboot_mode for moving to generic kernel code.

2013-06-06 Thread Robin Holt

This patch prepares for the moving the parsing of reboot= to the generic
kernel code by making reboot_mode into a more generic form.

Signed-off-by: Robin Holt 
To: Andrew Morton 
Cc: Russell King 
Cc: Russ Anderson 
Cc: Robin Holt 
Cc: H. Peter Anvin 
Cc: Guan Xuetao 
Cc: Linux Kernel Mailing List 
Cc: the arch/x86 maintainers 
Cc: Arm Mailing List 
Acked-by: Russell King 

---

Changes since -v10
 - Uncommented an accidentally commented out line.

Changes since -v8
 - Switched from using REBOOT_WARM/COLD to HARD/SOFT.
---
 arch/arm/include/asm/mach/arch.h   | 3 ++-
 arch/arm/kernel/process.c  | 8 
 arch/arm/kernel/setup.c| 6 +++---
 arch/arm/mach-footbridge/cats-hw.c | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 308ad7d..e2b551e 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -9,6 +9,7 @@
  */
 
 #ifndef __ASSEMBLY__
+#include 
 
 struct tag;
 struct meminfo;
@@ -39,7 +40,7 @@ struct machine_desc {
unsigned char   reserve_lp0 :1; /* never has lp0*/
unsigned char   reserve_lp1 :1; /* never has lp1*/
unsigned char   reserve_lp2 :1; /* never has lp2*/
-   charrestart_mode;   /* default restart mode */
+   enum reboot_modereboot_mode;/* default restart mode */
struct smp_operations   *smp;   /* SMP operations   */
void(*fixup)(struct tag *, char **,
 struct meminfo *);
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index f219703..92b47df 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -174,14 +174,14 @@ void arch_cpu_idle(void)
default_idle();
 }
 
-static char reboot_mode = 'h';
+enum reboot_mode reboot_mode = REBOOT_HARD;
 
-int __init reboot_setup(char *str)
+static int __init reboot_setup(char *str)
 {
-   reboot_mode = str[0];
+   if ('s' == str[0])
+   reboot_mode = REBOOT_SOFT;
return 1;
 }
-
 __setup("reboot=", reboot_setup);
 
 void machine_shutdown(void)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 1522c7a..e05df42 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -73,7 +73,7 @@ __setup("fpe=", fpe_setup);
 
 extern void paging_init(struct machine_desc *desc);
 extern void sanity_check_meminfo(void);
-extern void reboot_setup(char *str);
+extern enum reboot_mode reboot_mode;
 extern void setup_dma_zone(struct machine_desc *desc);
 
 unsigned int processor_id;
@@ -769,8 +769,8 @@ void __init setup_arch(char **cmdline_p)
 
setup_dma_zone(mdesc);
 
-   if (mdesc->restart_mode)
-   reboot_setup(>restart_mode);
+   if (mdesc->reboot_mode != REBOOT_HARD)
+   reboot_mode = mdesc->reboot_mode;
 
init_mm.start_code = (unsigned long) _text;
init_mm.end_code   = (unsigned long) _etext;
diff --git a/arch/arm/mach-footbridge/cats-hw.c 
b/arch/arm/mach-footbridge/cats-hw.c
index 6987a09..9669cc0 100644
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c
@@ -86,7 +86,7 @@ fixup_cats(struct tag *tags, char **cmdline, struct meminfo 
*mi)
 MACHINE_START(CATS, "Chalice-CATS")
/* Maintainer: Philip Blundell */
.atag_offset= 0x100,
-   .restart_mode   = 's',
+   .reboot_mode= REBOOT_SOFT,
.fixup  = fixup_cats,
.map_io = footbridge_map_io,
.init_irq   = footbridge_init_irq,
-- 
1.8.2.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH -v11 resend 09/11] arm, prepare reboot_mode for moving to generic kernel code.

2013-06-06 Thread Robin Holt

This patch prepares for the moving the parsing of reboot= to the generic
kernel code by making reboot_mode into a more generic form.

Signed-off-by: Robin Holt h...@sgi.com
To: Andrew Morton a...@linux-foundation.org
Cc: Russell King rmk+ker...@arm.linux.org.uk
Cc: Russ Anderson r...@sgi.com
Cc: Robin Holt h...@sgi.com
Cc: H. Peter Anvin h...@zytor.com
Cc: Guan Xuetao g...@mprc.pku.edu.cn
Cc: Linux Kernel Mailing List linux-kernel@vger.kernel.org
Cc: the arch/x86 maintainers x...@kernel.org
Cc: Arm Mailing List linux-arm-ker...@lists.infradead.org
Acked-by: Russell King rmk+ker...@arm.linux.org.uk

---

Changes since -v10
 - Uncommented an accidentally commented out line.

Changes since -v8
 - Switched from using REBOOT_WARM/COLD to HARD/SOFT.
---
 arch/arm/include/asm/mach/arch.h   | 3 ++-
 arch/arm/kernel/process.c  | 8 
 arch/arm/kernel/setup.c| 6 +++---
 arch/arm/mach-footbridge/cats-hw.c | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 308ad7d..e2b551e 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -9,6 +9,7 @@
  */
 
 #ifndef __ASSEMBLY__
+#include linux/reboot.h
 
 struct tag;
 struct meminfo;
@@ -39,7 +40,7 @@ struct machine_desc {
unsigned char   reserve_lp0 :1; /* never has lp0*/
unsigned char   reserve_lp1 :1; /* never has lp1*/
unsigned char   reserve_lp2 :1; /* never has lp2*/
-   charrestart_mode;   /* default restart mode */
+   enum reboot_modereboot_mode;/* default restart mode */
struct smp_operations   *smp;   /* SMP operations   */
void(*fixup)(struct tag *, char **,
 struct meminfo *);
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index f219703..92b47df 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -174,14 +174,14 @@ void arch_cpu_idle(void)
default_idle();
 }
 
-static char reboot_mode = 'h';
+enum reboot_mode reboot_mode = REBOOT_HARD;
 
-int __init reboot_setup(char *str)
+static int __init reboot_setup(char *str)
 {
-   reboot_mode = str[0];
+   if ('s' == str[0])
+   reboot_mode = REBOOT_SOFT;
return 1;
 }
-
 __setup(reboot=, reboot_setup);
 
 void machine_shutdown(void)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 1522c7a..e05df42 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -73,7 +73,7 @@ __setup(fpe=, fpe_setup);
 
 extern void paging_init(struct machine_desc *desc);
 extern void sanity_check_meminfo(void);
-extern void reboot_setup(char *str);
+extern enum reboot_mode reboot_mode;
 extern void setup_dma_zone(struct machine_desc *desc);
 
 unsigned int processor_id;
@@ -769,8 +769,8 @@ void __init setup_arch(char **cmdline_p)
 
setup_dma_zone(mdesc);
 
-   if (mdesc-restart_mode)
-   reboot_setup(mdesc-restart_mode);
+   if (mdesc-reboot_mode != REBOOT_HARD)
+   reboot_mode = mdesc-reboot_mode;
 
init_mm.start_code = (unsigned long) _text;
init_mm.end_code   = (unsigned long) _etext;
diff --git a/arch/arm/mach-footbridge/cats-hw.c 
b/arch/arm/mach-footbridge/cats-hw.c
index 6987a09..9669cc0 100644
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c
@@ -86,7 +86,7 @@ fixup_cats(struct tag *tags, char **cmdline, struct meminfo 
*mi)
 MACHINE_START(CATS, Chalice-CATS)
/* Maintainer: Philip Blundell */
.atag_offset= 0x100,
-   .restart_mode   = 's',
+   .reboot_mode= REBOOT_SOFT,
.fixup  = fixup_cats,
.map_io = footbridge_map_io,
.init_irq   = footbridge_init_irq,
-- 
1.8.2.1

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH -v11 resend 09/11] arm, prepare reboot_mode for moving to generic kernel code.

2013-05-16 Thread Robin Holt

This patch prepares for the moving the parsing of reboot= to the generic
kernel code by making reboot_mode into a more generic form.

Signed-off-by: Robin Holt 
To: Andrew Morton 
Cc: Russell King 
Cc: Russ Anderson 
Cc: Robin Holt 
Cc: H. Peter Anvin 
Cc: Guan Xuetao 
Cc: Linux Kernel Mailing List 
Cc: the arch/x86 maintainers 
Cc: Arm Mailing List 
Acked-by: Russell King 

---

Changes since -v10
 - Uncommented an accidentally commented out line.

Changes since -v8
 - Switched from using REBOOT_WARM/COLD to HARD/SOFT.
---
 arch/arm/include/asm/mach/arch.h   | 3 ++-
 arch/arm/kernel/process.c  | 8 
 arch/arm/kernel/setup.c| 6 +++---
 arch/arm/mach-footbridge/cats-hw.c | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 308ad7d..e2b551e 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -9,6 +9,7 @@
  */
 
 #ifndef __ASSEMBLY__
+#include 
 
 struct tag;
 struct meminfo;
@@ -39,7 +40,7 @@ struct machine_desc {
unsigned char   reserve_lp0 :1; /* never has lp0*/
unsigned char   reserve_lp1 :1; /* never has lp1*/
unsigned char   reserve_lp2 :1; /* never has lp2*/
-   charrestart_mode;   /* default restart mode */
+   enum reboot_modereboot_mode;/* default restart mode */
struct smp_operations   *smp;   /* SMP operations   */
void(*fixup)(struct tag *, char **,
 struct meminfo *);
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index f219703..92b47df 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -174,14 +174,14 @@ void arch_cpu_idle(void)
default_idle();
 }
 
-static char reboot_mode = 'h';
+enum reboot_mode reboot_mode = REBOOT_HARD;
 
-int __init reboot_setup(char *str)
+static int __init reboot_setup(char *str)
 {
-   reboot_mode = str[0];
+   if ('s' == str[0])
+   reboot_mode = REBOOT_SOFT;
return 1;
 }
-
 __setup("reboot=", reboot_setup);
 
 void machine_shutdown(void)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 1522c7a..e05df42 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -73,7 +73,7 @@ __setup("fpe=", fpe_setup);
 
 extern void paging_init(struct machine_desc *desc);
 extern void sanity_check_meminfo(void);
-extern void reboot_setup(char *str);
+extern enum reboot_mode reboot_mode;
 extern void setup_dma_zone(struct machine_desc *desc);
 
 unsigned int processor_id;
@@ -769,8 +769,8 @@ void __init setup_arch(char **cmdline_p)
 
setup_dma_zone(mdesc);
 
-   if (mdesc->restart_mode)
-   reboot_setup(>restart_mode);
+   if (mdesc->reboot_mode != REBOOT_HARD)
+   reboot_mode = mdesc->reboot_mode;
 
init_mm.start_code = (unsigned long) _text;
init_mm.end_code   = (unsigned long) _etext;
diff --git a/arch/arm/mach-footbridge/cats-hw.c 
b/arch/arm/mach-footbridge/cats-hw.c
index 6987a09..9669cc0 100644
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c
@@ -86,7 +86,7 @@ fixup_cats(struct tag *tags, char **cmdline, struct meminfo 
*mi)
 MACHINE_START(CATS, "Chalice-CATS")
/* Maintainer: Philip Blundell */
.atag_offset= 0x100,
-   .restart_mode   = 's',
+   .reboot_mode= REBOOT_SOFT,
.fixup  = fixup_cats,
.map_io = footbridge_map_io,
.init_irq   = footbridge_init_irq,
-- 
1.8.2.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH -v11 resend 09/11] arm, prepare reboot_mode for moving to generic kernel code.

2013-05-16 Thread Robin Holt

This patch prepares for the moving the parsing of reboot= to the generic
kernel code by making reboot_mode into a more generic form.

Signed-off-by: Robin Holt h...@sgi.com
To: Andrew Morton a...@linux-foundation.org
Cc: Russell King rmk+ker...@arm.linux.org.uk
Cc: Russ Anderson r...@sgi.com
Cc: Robin Holt h...@sgi.com
Cc: H. Peter Anvin h...@zytor.com
Cc: Guan Xuetao g...@mprc.pku.edu.cn
Cc: Linux Kernel Mailing List linux-kernel@vger.kernel.org
Cc: the arch/x86 maintainers x...@kernel.org
Cc: Arm Mailing List linux-arm-ker...@lists.infradead.org
Acked-by: Russell King rmk+ker...@arm.linux.org.uk

---

Changes since -v10
 - Uncommented an accidentally commented out line.

Changes since -v8
 - Switched from using REBOOT_WARM/COLD to HARD/SOFT.
---
 arch/arm/include/asm/mach/arch.h   | 3 ++-
 arch/arm/kernel/process.c  | 8 
 arch/arm/kernel/setup.c| 6 +++---
 arch/arm/mach-footbridge/cats-hw.c | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 308ad7d..e2b551e 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -9,6 +9,7 @@
  */
 
 #ifndef __ASSEMBLY__
+#include linux/reboot.h
 
 struct tag;
 struct meminfo;
@@ -39,7 +40,7 @@ struct machine_desc {
unsigned char   reserve_lp0 :1; /* never has lp0*/
unsigned char   reserve_lp1 :1; /* never has lp1*/
unsigned char   reserve_lp2 :1; /* never has lp2*/
-   charrestart_mode;   /* default restart mode */
+   enum reboot_modereboot_mode;/* default restart mode */
struct smp_operations   *smp;   /* SMP operations   */
void(*fixup)(struct tag *, char **,
 struct meminfo *);
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index f219703..92b47df 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -174,14 +174,14 @@ void arch_cpu_idle(void)
default_idle();
 }
 
-static char reboot_mode = 'h';
+enum reboot_mode reboot_mode = REBOOT_HARD;
 
-int __init reboot_setup(char *str)
+static int __init reboot_setup(char *str)
 {
-   reboot_mode = str[0];
+   if ('s' == str[0])
+   reboot_mode = REBOOT_SOFT;
return 1;
 }
-
 __setup(reboot=, reboot_setup);
 
 void machine_shutdown(void)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 1522c7a..e05df42 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -73,7 +73,7 @@ __setup(fpe=, fpe_setup);
 
 extern void paging_init(struct machine_desc *desc);
 extern void sanity_check_meminfo(void);
-extern void reboot_setup(char *str);
+extern enum reboot_mode reboot_mode;
 extern void setup_dma_zone(struct machine_desc *desc);
 
 unsigned int processor_id;
@@ -769,8 +769,8 @@ void __init setup_arch(char **cmdline_p)
 
setup_dma_zone(mdesc);
 
-   if (mdesc-restart_mode)
-   reboot_setup(mdesc-restart_mode);
+   if (mdesc-reboot_mode != REBOOT_HARD)
+   reboot_mode = mdesc-reboot_mode;
 
init_mm.start_code = (unsigned long) _text;
init_mm.end_code   = (unsigned long) _etext;
diff --git a/arch/arm/mach-footbridge/cats-hw.c 
b/arch/arm/mach-footbridge/cats-hw.c
index 6987a09..9669cc0 100644
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c
@@ -86,7 +86,7 @@ fixup_cats(struct tag *tags, char **cmdline, struct meminfo 
*mi)
 MACHINE_START(CATS, Chalice-CATS)
/* Maintainer: Philip Blundell */
.atag_offset= 0x100,
-   .restart_mode   = 's',
+   .reboot_mode= REBOOT_SOFT,
.fixup  = fixup_cats,
.map_io = footbridge_map_io,
.init_irq   = footbridge_init_irq,
-- 
1.8.2.1

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH -v11 resend 09/11] arm, prepare reboot_mode for moving to generic kernel code.

[PATCH -v11 resend 09/11] arm, prepare reboot_mode for moving to generic kernel code.

[PATCH -v11 resend 09/11] arm, prepare reboot_mode for moving to generic kernel code.

[PATCH -v11 resend 09/11] arm, prepare reboot_mode for moving to generic kernel code.

4 matches

Site Navigation

Mail list logo

Footer information