* [PATCH 02/07] kernel.h panic cleanup
@ 2010-02-25 15:39 Dave Young
2010-02-25 18:53 ` Alexey Dobriyan
0 siblings, 1 reply; 3+ messages in thread
From: Dave Young @ 2010-02-25 15:39 UTC (permalink / raw)
To: Andrew Morton, Ingo Molnar, Greg Kroah-Hartman, Steven Rostedt,
Frederic Weisbecker, linux-kernel
Cleanup kernel.h panic related stuff, move to linux/panic.h
Due to lots of files need it, include them in kernel.h just for convinience
It can be thought as the first step of further cleanup.
Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
---
include/linux/kernel.h | 29 +----------------------------
include/linux/panic.h | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 28 deletions(-)
--- linux-2.6.orig/include/linux/kernel.h 2010-02-25 20:43:08.000000000 +0800
+++ linux-2.6/include/linux/kernel.h 2010-02-25 20:45:26.000000000 +0800
@@ -14,6 +14,7 @@
#include <linux/log2.h>
#include <linux/typecheck.h>
#include <linux/printk.h>
+#include <linux/panic.h>
#include <asm/byteorder.h>
#include <asm/bug.h>
@@ -131,13 +132,6 @@ static inline void might_fault(void)
}
#endif
-extern struct atomic_notifier_head panic_notifier_list;
-extern long (*panic_blink)(long time);
-NORET_TYPE void panic(const char * fmt, ...)
- __attribute__ ((NORET_AND format (printf, 1, 2))) __cold;
-extern void oops_enter(void);
-extern void oops_exit(void);
-extern int oops_may_print(void);
NORET_TYPE void do_exit(long error_code)
ATTRIB_NORET;
NORET_TYPE void complete_and_exit(struct completion *, long)
@@ -186,15 +180,6 @@ extern struct pid *session_of_pgrp(struc
unsigned long int_sqrt(unsigned long);
extern void bust_spinlocks(int yes);
-extern int oops_in_progress; /* If set, an oops, panic(), BUG() or die() is in progress */
-extern int panic_timeout;
-extern int panic_on_oops;
-extern int panic_on_unrecovered_nmi;
-extern int panic_on_io_nmi;
-extern const char *print_tainted(void);
-extern void add_taint(unsigned flag);
-extern int test_taint(unsigned flag);
-extern unsigned long get_taint(void);
extern int root_mountflags;
/* Values used for system_state */
@@ -207,18 +192,6 @@ extern enum system_states {
SYSTEM_SUSPEND_DISK,
} system_state;
-#define TAINT_PROPRIETARY_MODULE 0
-#define TAINT_FORCED_MODULE 1
-#define TAINT_UNSAFE_SMP 2
-#define TAINT_FORCED_RMMOD 3
-#define TAINT_MACHINE_CHECK 4
-#define TAINT_BAD_PAGE 5
-#define TAINT_USER 6
-#define TAINT_DIE 7
-#define TAINT_OVERRIDDEN_ACPI_TABLE 8
-#define TAINT_WARN 9
-#define TAINT_CRAP 10
-
extern void dump_stack(void) __cold;
enum {
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6/include/linux/panic.h 2010-02-25 20:45:55.000000000 +0800
@@ -0,0 +1,34 @@
+#ifndef _PANIC_H
+#define _PANIC_H
+
+#include <linux/linkage.h>
+#define TAINT_PROPRIETARY_MODULE 0
+#define TAINT_FORCED_MODULE 1
+#define TAINT_UNSAFE_SMP 2
+#define TAINT_FORCED_RMMOD 3
+#define TAINT_MACHINE_CHECK 4
+#define TAINT_BAD_PAGE 5
+#define TAINT_USER 6
+#define TAINT_DIE 7
+#define TAINT_OVERRIDDEN_ACPI_TABLE 8
+#define TAINT_WARN 9
+#define TAINT_CRAP 10
+
+extern struct atomic_notifier_head panic_notifier_list;
+extern long (*panic_blink)(long time);
+NORET_TYPE void panic(const char *fmt, ...)
+ __attribute__ ((NORET_AND format (printf, 1, 2))) __cold;
+extern void oops_enter(void);
+extern void oops_exit(void);
+extern int oops_may_print(void);
+/* If set, an oops, panic(), BUG() or die() is in progress */
+extern int oops_in_progress;
+extern int panic_timeout;
+extern int panic_on_oops;
+extern int panic_on_unrecovered_nmi;
+extern int panic_on_io_nmi;
+extern const char *print_tainted(void);
+extern void add_taint(unsigned flag);
+extern int test_taint(unsigned flag);
+extern unsigned long get_taint(void);
+#endif
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 02/07] kernel.h panic cleanup
2010-02-25 15:39 [PATCH 02/07] kernel.h panic cleanup Dave Young
@ 2010-02-25 18:53 ` Alexey Dobriyan
2010-02-26 1:10 ` Dave Young
0 siblings, 1 reply; 3+ messages in thread
From: Alexey Dobriyan @ 2010-02-25 18:53 UTC (permalink / raw)
To: Dave Young
Cc: Andrew Morton, Ingo Molnar, Greg Kroah-Hartman, Steven Rostedt,
Frederic Weisbecker, linux-kernel
On Thu, Feb 25, 2010 at 11:39:11PM +0800, Dave Young wrote:
> Cleanup kernel.h panic related stuff, move to linux/panic.h
>
> Due to lots of files need it, include them in kernel.h just for convinience
> It can be thought as the first step of further cleanup.
NAK, tainted stuff belongs to separate place.
> --- linux-2.6.orig/include/linux/kernel.h
> +++ linux-2.6/include/linux/kernel.h
> -extern const char *print_tainted(void);
> -extern void add_taint(unsigned flag);
> -extern int test_taint(unsigned flag);
> -extern unsigned long get_taint(void);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 02/07] kernel.h panic cleanup
2010-02-25 18:53 ` Alexey Dobriyan
@ 2010-02-26 1:10 ` Dave Young
0 siblings, 0 replies; 3+ messages in thread
From: Dave Young @ 2010-02-26 1:10 UTC (permalink / raw)
To: Alexey Dobriyan
Cc: Andrew Morton, Ingo Molnar, Greg Kroah-Hartman, Steven Rostedt,
Frederic Weisbecker, linux-kernel
On Fri, Feb 26, 2010 at 2:53 AM, Alexey Dobriyan <adobriyan@gmail.com> wrote:
> On Thu, Feb 25, 2010 at 11:39:11PM +0800, Dave Young wrote:
>> Cleanup kernel.h panic related stuff, move to linux/panic.h
>>
>> Due to lots of files need it, include them in kernel.h just for convinience
>> It can be thought as the first step of further cleanup.
>
> NAK, tainted stuff belongs to separate place.
Then where should they go?
>
>> --- linux-2.6.orig/include/linux/kernel.h
>> +++ linux-2.6/include/linux/kernel.h
>> -extern const char *print_tainted(void);
>> -extern void add_taint(unsigned flag);
>> -extern int test_taint(unsigned flag);
>> -extern unsigned long get_taint(void);
>
--
Regards
dave
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-02-26 1:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-25 15:39 [PATCH 02/07] kernel.h panic cleanup Dave Young
2010-02-25 18:53 ` Alexey Dobriyan
2010-02-26 1:10 ` Dave Young
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox