diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 17:52:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 17:52:29 -0800 |
| commit | baf4e2cf9dddbc39fdb7dde6e3f9ebc107b67b78 (patch) | |
| tree | b11a69e0dda62c40b231ae748138ce7908d9cade /include/linux | |
| parent | 6805de5d7eb97f6e905b152b2fc1ee03fd0fb3aa (diff) | |
v2.4.0.9 -> v2.4.0.10
- got a few too-new R128 #defines in the Radeon merge. Fix.
- tulip driver update from Jeff Garzik
- more cpq and DAC elevator fixes from Jens. Looks good.
- Petr Vandrovec: nicer ncpfs behaviour
- Andy Grover: APCI update
- Cort Dougan: PPC update
- David Miller: sparc updates
- David Miller: networking updates
- Neil Brown: RAID5 fixes
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 2 | ||||
| -rw-r--r-- | include/linux/dn.h | 8 | ||||
| -rw-r--r-- | include/linux/sched.h | 1 | ||||
| -rw-r--r-- | include/linux/vt_kern.h | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index ff1dcaf45551..38b7a6a982a5 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -28,8 +28,6 @@ #include <linux/wait.h> #endif /* __KERNEL__ */ -u64 acpi_get_rsdp_ptr(void); - /* * System sleep states */ diff --git a/include/linux/dn.h b/include/linux/dn.h index c7448158b152..d98b0c3c7903 100644 --- a/include/linux/dn.h +++ b/include/linux/dn.h @@ -45,7 +45,12 @@ #define DSO_LINKINFO 7 /* Set/Get link information */ #define DSO_STREAM 8 /* Set socket type to stream */ #define DSO_SEQPACKET 9 /* Set socket type to sequenced packet */ -#define DSO_MAX 10 /* Maximum option number */ +#define DSO_MAXWINDOW 11 /* Maximum window size allowed */ +#define DSO_NODELAY 12 /* Turn off nagle */ +#define DSO_CORK 13 /* Wait for more data! */ +#define DSO_SERVICES 14 /* NSP Services field */ +#define DSO_INFO 15 /* NSP Info field */ +#define DSO_MAX 15 /* Maximum option number */ /* LINK States */ @@ -138,5 +143,6 @@ struct dn_addr { #define SIOCGNETADDR _IOR(DECNET_IOCTL_BASE, 0xe1, struct dn_naddr) #define OSIOCSNETADDR _IOW(DECNET_IOCTL_BASE, 0xe0, int) #define OSIOCGNETADDR _IOR(DECNET_IOCTL_BASE, 0xe1, int) +/* #define SIOCATEOR _IOR(DECNET_IOCTL_BASE, 0x01, int) */ #endif /* _LINUX_DN_H */ diff --git a/include/linux/sched.h b/include/linux/sched.h index 4f6645a3d555..d139801f4041 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -563,6 +563,7 @@ extern void FASTCALL(wake_up_process(struct task_struct * tsk)); #define wake_up_interruptible_all(x) __wake_up((x),TASK_INTERRUPTIBLE, 0) #define wake_up_interruptible_sync(x) __wake_up_sync((x),TASK_INTERRUPTIBLE, 1) #define wake_up_interruptible_sync_nr(x) __wake_up_sync((x),TASK_INTERRUPTIBLE, nr) +asmlinkage long sys_wait4(pid_t pid,unsigned int * stat_addr, int options, struct rusage * ru); extern int in_group_p(gid_t); extern int in_egroup_p(gid_t); diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h index 80feae4c7e40..f24e4de6b9ac 100644 --- a/include/linux/vt_kern.h +++ b/include/linux/vt_kern.h @@ -30,7 +30,7 @@ extern struct vt_struct { wait_queue_head_t paste_wait; } *vt_cons[MAX_NR_CONSOLES]; -void (*kd_mksound)(unsigned int hz, unsigned int ticks); +extern void (*kd_mksound)(unsigned int hz, unsigned int ticks); /* console.c */ |