diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2003-10-21 18:41:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-10-21 18:41:05 -0700 |
| commit | 95c2f4d9c4bf281cc311c3f8affbf9112dd432a5 (patch) | |
| tree | 0ce0eaff54bd4d7a2572e4af589a03dc21220656 /include/linux | |
| parent | 667b591e8568faef6e6ff336d270df741029fdf1 (diff) | |
| parent | 669e746156412f8bfee48dca22c685d2479a98d3 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kernel.h | 2 | ||||
| -rw-r--r-- | include/linux/timex.h | 1 | ||||
| -rw-r--r-- | include/linux/toshiba.h | 9 |
3 files changed, 2 insertions, 10 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 6403c9ef2210..6d4cb2db44db 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -101,7 +101,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_on_oops; - +extern int system_running; extern int tainted; extern const char *print_tainted(void); #define TAINT_PROPRIETARY_MODULE (1<<0) diff --git a/include/linux/timex.h b/include/linux/timex.h index 2b1665d57ad0..c9e92e016524 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h @@ -302,6 +302,7 @@ extern long time_adj; /* tick adjust (scaled 1 / HZ) */ extern long time_reftime; /* time at last adjustment (s) */ extern long time_adjust; /* The amount of adjtime left */ +extern long time_next_adjust; /* Value for time_adjust at next tick */ /* interface variables pps->timer interrupt */ extern long pps_offset; /* pps time offset (us) */ diff --git a/include/linux/toshiba.h b/include/linux/toshiba.h index 8e57735c2476..916e5e3a699b 100644 --- a/include/linux/toshiba.h +++ b/include/linux/toshiba.h @@ -33,13 +33,4 @@ typedef struct { unsigned int edi __attribute__ ((packed)); } SMMRegisters; -#ifdef CONFIG_PROC_FS -static int tosh_get_info(char *, char **, off_t, int); -#else /* !CONFIG_PROC_FS */ -inline int tosh_get_info(char *buffer, char **start, off_t fpos, int lenght) -{ - return 0; -} -#endif /* CONFIG_PROC_FS */ - #endif |