diff options
Diffstat (limited to 'include/asm-m68k')
| -rw-r--r-- | include/asm-m68k/processor.h | 11 | ||||
| -rw-r--r-- | include/asm-m68k/shmparam.h | 45 | ||||
| -rw-r--r-- | include/asm-m68k/termios.h | 1 |
3 files changed, 13 insertions, 44 deletions
diff --git a/include/asm-m68k/processor.h b/include/asm-m68k/processor.h index 7b6564813..7b7c9e094 100644 --- a/include/asm-m68k/processor.h +++ b/include/asm-m68k/processor.h @@ -134,6 +134,17 @@ extern inline unsigned long thread_saved_pc(struct thread_struct *t) return sw->retpc; } +unsigned long get_wchan(struct task_struct *p); + +#define KSTK_EIP(tsk) \ + ({ \ + unsigned long eip = 0; \ + if ((tsk)->thread.esp0 > PAGE_SIZE && \ + MAP_NR((tsk)->thread.esp0) < max_mapnr) \ + eip = ((struct pt_regs *) (tsk)->thread.esp0)->pc; \ + eip; }) +#define KSTK_ESP(tsk) ((tsk) == current ? rdusp() : (tsk)->thread.usp) + #define THREAD_SIZE (2*PAGE_SIZE) /* Allocation and freeing of basic task resources. */ diff --git a/include/asm-m68k/shmparam.h b/include/asm-m68k/shmparam.h index 2b8640c17..558892a2e 100644 --- a/include/asm-m68k/shmparam.h +++ b/include/asm-m68k/shmparam.h @@ -1,49 +1,6 @@ #ifndef _M68K_SHMPARAM_H #define _M68K_SHMPARAM_H -/* address range for shared memory attaches if no address passed to shmat() */ -#ifndef CONFIG_SUN3 -#define SHM_RANGE_START 0xC0000000 -#define SHM_RANGE_END 0xD0000000 -#else -#define SHM_RANGE_START 0x0C000000 -#define SHM_RANGE_END 0x0D000000 -#endif - -/* - * Format of a swap-entry for shared memory pages currently out in - * swap space (see also mm/swap.c). - * - * SWP_TYPE = SHM_SWP_TYPE - * SWP_OFFSET is used as follows: - * - * bits 0..6 : id of shared memory segment page belongs to (SHM_ID) - * bits 7..21: index of page within shared memory segment (SHM_IDX) - * (actually fewer bits get used since SHMMAX is so low) - */ - -/* - * Keep _SHM_ID_BITS as low as possible since SHMMNI depends on it and - * there is a static array of size SHMMNI. - */ -#define _SHM_ID_BITS 7 -#define SHM_ID_MASK ((1<<_SHM_ID_BITS)-1) - -#define SHM_IDX_SHIFT (_SHM_ID_BITS) -#define _SHM_IDX_BITS 15 -#define SHM_IDX_MASK ((1<<_SHM_IDX_BITS)-1) - -/* - * _SHM_ID_BITS + _SHM_IDX_BITS must be <= 24 on the i386 and - * SHMMAX <= (PAGE_SIZE << _SHM_IDX_BITS). - */ - -#define SHMMAX 0x1000000 /* max shared seg size (bytes) */ -#define SHMMIN 1 /* really PAGE_SIZE */ /* min shared seg size (bytes) */ -#define SHMMNI (1<<_SHM_ID_BITS) /* max num of segs system wide */ -#define SHMALL /* max shm system wide (pages) */ \ - (1<<(_SHM_IDX_BITS+_SHM_ID_BITS)) -#define SHMLBA PAGE_SIZE /* attach addr a multiple of this */ -#define SHMSEG SHMMNI /* max shared segs per process */ +#define SHMLBA PAGE_SIZE /* attach addr a multiple of this */ #endif /* _M68K_SHMPARAM_H */ diff --git a/include/asm-m68k/termios.h b/include/asm-m68k/termios.h index fcc26bf03..07f6b8585 100644 --- a/include/asm-m68k/termios.h +++ b/include/asm-m68k/termios.h @@ -61,6 +61,7 @@ struct termio { #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 */ #define N_HDLC 13 /* synchronous HDLC */ +#define N_SYNC_PPP 14 #ifdef __KERNEL__ |