diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /include/asm-sparc | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/page.h | 1 | ||||
| -rw-r--r-- | include/asm-sparc/processor.h | 1 | ||||
| -rw-r--r-- | include/asm-sparc/semaphore.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc/termios.h | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-sparc/page.h b/include/asm-sparc/page.h index 57e46e7b0..14513a0b6 100644 --- a/include/asm-sparc/page.h +++ b/include/asm-sparc/page.h @@ -19,7 +19,6 @@ #ifdef __KERNEL__ -#include <linux/config.h> #include <asm/head.h> /* for KERNBASE */ #include <asm/btfixup.h> diff --git a/include/asm-sparc/processor.h b/include/asm-sparc/processor.h index 6f34d510b..14a4621dd 100644 --- a/include/asm-sparc/processor.h +++ b/include/asm-sparc/processor.h @@ -148,6 +148,7 @@ extern __inline__ void start_thread(struct pt_regs * regs, unsigned long pc, #define copy_segments(nr, tsk, mm) do { } while (0) #define release_segments(mm) do { } while (0) +#define forget_segments() do { } while (0) #ifdef __KERNEL__ diff --git a/include/asm-sparc/semaphore.h b/include/asm-sparc/semaphore.h index 2832f8ed4..e9b490a5a 100644 --- a/include/asm-sparc/semaphore.h +++ b/include/asm-sparc/semaphore.h @@ -30,7 +30,7 @@ do { \ restore_flags(flags); \ } while(0) -#define waking_non_zero(sem) \ +#define waking_non_zero(sem,tsk)\ ({ unsigned long flags; \ int ret = 0; \ save_and_cli(flags); \ diff --git a/include/asm-sparc/termios.h b/include/asm-sparc/termios.h index aeefe28e4..d00d6558c 100644 --- a/include/asm-sparc/termios.h +++ b/include/asm-sparc/termios.h @@ -66,6 +66,8 @@ struct winsize { #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ #define N_R3964 9 /* Reserved for Simatic R3964 module */ #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ +#define N_IRDA 11 /* Linux IrDa - http://www.cs.uit.no/~dagb/irda/irda.html */ +#define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ #ifdef __KERNEL__ |