linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / kernel.h

diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index f6dc34a..d1c9dea 100644 (file)
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -88,13 +88,10 @@ extern int cond_resched(void);
                (__x < 0) ? -__x : __x;         \
        })
 
-extern struct atomic_notifier_head panic_notifier_list;
+extern struct notifier_block *panic_notifier_list;
 extern long (*panic_blink)(long time);
 NORET_TYPE void panic(const char * fmt, ...)
        __attribute__ ((NORET_AND format (printf, 1, 2)));
-extern void oops_enter(void);
-extern void oops_exit(void);
-extern int oops_may_print(void);
 fastcall NORET_TYPE void do_exit(long error_code)
        ATTRIB_NORET;
 NORET_TYPE void complete_and_exit(struct completion *, long)
@@ -125,7 +122,6 @@ extern int get_option(char **str, int *pint);
 extern char *get_options(const char *str, int nints, int *ints);
 extern unsigned long long memparse(char *ptr, char **retptr);
 
-extern int core_kernel_text(unsigned long addr);
 extern int __kernel_text_address(unsigned long addr);
 extern int kernel_text_address(unsigned long addr);
 extern int session_of_pgrp(int pgrp);
@@ -156,10 +152,9 @@ static inline int __attribute_pure__ long_log2(unsigned long x)
        return r;
 }
 
-static inline unsigned long
-__attribute_const__ roundup_pow_of_two(unsigned long x)
+static inline unsigned long __attribute_const__ roundup_pow_of_two(unsigned long x)
 {
-       return 1UL << fls_long(x - 1);
+       return (1UL << fls(x - 1));
 }
 
 extern int printk_ratelimit(void);
@@ -178,7 +173,7 @@ static inline void console_verbose(void)
 
 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 __deprecated_for_modules int panic_timeout;
 extern int panic_on_oops;
 extern int tainted;
 extern const char *print_tainted(void);