summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/.cvsignore3
-rw-r--r--include/linux/binfmts.h1
-rw-r--r--include/linux/elf.h12
-rw-r--r--include/linux/fs.h11
-rw-r--r--include/linux/genhd.h4
-rw-r--r--include/linux/ipc.h4
-rw-r--r--include/linux/mm.h14
-rw-r--r--include/linux/msg.h4
-rw-r--r--include/linux/mtio.h4
-rw-r--r--include/linux/personality.h3
-rw-r--r--include/linux/proc_fs.h1
-rw-r--r--include/linux/string.h4
-rw-r--r--include/linux/tcp.h2
-rw-r--r--include/linux/time.h4
-rw-r--r--include/linux/tty.h2
15 files changed, 28 insertions, 45 deletions
diff --git a/include/linux/.cvsignore b/include/linux/.cvsignore
new file mode 100644
index 000000000..c4ff4db8f
--- /dev/null
+++ b/include/linux/.cvsignore
@@ -0,0 +1,3 @@
+autoconf.h
+version.h
+compile.h
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index 6c424fbe9..6cb59427c 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -48,6 +48,7 @@ extern int read_exec(struct inode *inode, unsigned long offset,
extern int open_inode(struct inode * inode, int mode);
extern int init_elf_binfmt(void);
+extern int init_irix_binfmt(void);
extern int init_aout_binfmt(void);
extern int init_script_binfmt(void);
extern int init_java_binfmt(void);
diff --git a/include/linux/elf.h b/include/linux/elf.h
index 3487041ba..726d0aa4b 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -56,18 +56,6 @@ typedef unsigned long Elf32_Word;
#define EM_SPARC64 11 /* SPARC v9 (not official) 64-bit */
#define EM_PARISC 15
-#define EM_MIPS 8 /* MIPS R3000 (officially, big-endian only) */
-
-#define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */
-
-#define EM_SPARC64 11 /* SPARC v9 (not official) 64-bit */
-
-#define EM_PARISC 15 /* HPPA */
-
-#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */
-
-#define EM_PPC 20 /* PowerPC */
-
/*
* This is an interim value that we will use until the committee comes
* up with a final number.
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 0c64ed100..2283c278e 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -616,18 +616,7 @@ extern int fsync_dev(kdev_t dev);
extern void sync_supers(kdev_t dev);
extern int bmap(struct inode * inode,int block);
extern int notify_change(struct inode *, struct iattr *);
-extern int _namei(const char * pathname, struct inode * base,
- int follow_links, struct inode ** res_inode);
extern int namei(const char * pathname, struct inode ** res_inode);
-/*
- * knamei() is the same as namei() except that it doesn't attempt
- * to copy the pathname from userspace to kernelspace. So it
- * can be used for names in kernelspace.
- */
-extern inline int knamei(const char *pathname, struct inode **res_inode)
-{
- return _namei(pathname, NULL, 1, res_inode);
-}
extern int lnamei(const char * pathname, struct inode ** res_inode);
extern int permission(struct inode * inode,int mask);
extern int get_write_access(struct inode *inode);
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 535cdefdc..44e600fc3 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -21,6 +21,10 @@
#define CONFIG_SUN_PARTITION 1
#endif
+#if defined(CONFIG_SGI)
+#define CONFIG_SGI_PARTITION 1
+#endif
+
/* These two have identical behaviour; use the second one if DOS fdisk gets
confused about extended/logical partitions starting past cylinder 1023. */
#define DOS_EXTENDED_PARTITION 5
diff --git a/include/linux/ipc.h b/include/linux/ipc.h
index 9349f0f49..88824df8a 100644
--- a/include/linux/ipc.h
+++ b/include/linux/ipc.h
@@ -3,7 +3,7 @@
#include <linux/types.h>
-#define IPC_PRIVATE ((__kernel_key_t) 0)
+#define IPC_PRIVATE ((key_t) 0)
struct ipc_perm
{
@@ -12,7 +12,7 @@ struct ipc_perm
__kernel_gid_t gid;
__kernel_uid_t cuid;
__kernel_gid_t cgid;
- __kernel_mode_t mode;
+ __kernel_mode_t mode;
unsigned short seq;
};
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 149e6eaeb..6af5f2401 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -222,20 +222,6 @@ typedef struct page {
extern mem_map_t * mem_map;
/*
- * Free area management
- */
-
-#define NR_MEM_LISTS 6
-
-struct mem_list {
- struct mem_list * next;
- struct mem_list * prev;
-};
-
-extern struct mem_list free_area_list[NR_MEM_LISTS];
-extern unsigned int * free_area_map[NR_MEM_LISTS];
-
-/*
* This is timing-critical - most of the time in getting a new page
* goes to clearing the page. If you want a page without the clearing
* overhead, just use __get_free_page() directly..
diff --git a/include/linux/msg.h b/include/linux/msg.h
index 2be627198..deda19265 100644
--- a/include/linux/msg.h
+++ b/include/linux/msg.h
@@ -58,6 +58,10 @@ struct msginfo {
#define __MSGSEG ((MSGPOOL*1024)/ MSGSSZ) /* max no. of segments */
#define MSGSEG (__MSGSEG <= 0xffff ? __MSGSEG : 0xffff)
+/* ipcs ctl commands */
+#define MSG_STAT 11
+#define MSG_INFO 12
+
#ifdef __KERNEL__
/* one msg structure for each message */
diff --git a/include/linux/mtio.h b/include/linux/mtio.h
index 22cec7aaa..61db37850 100644
--- a/include/linux/mtio.h
+++ b/include/linux/mtio.h
@@ -74,8 +74,8 @@ struct mtget {
long mt_gstat; /* generic (device independent) status */
long mt_erreg; /* error register */
/* The next two fields are not always used */
- __kernel_daddr_t mt_fileno; /* number of current file on tape */
- __kernel_daddr_t mt_blkno; /* current block number */
+ __kernel_daddr_t mt_fileno; /* number of current file on tape */
+ __kernel_daddr_t mt_blkno; /* current block number */
};
diff --git a/include/linux/personality.h b/include/linux/personality.h
index 91538d2bd..c8f09ebea 100644
--- a/include/linux/personality.h
+++ b/include/linux/personality.h
@@ -21,6 +21,9 @@
#define PER_ISCR4 (0x0005 | STICKY_TIMEOUTS)
#define PER_BSD (0x0006)
#define PER_XENIX (0x0007 | STICKY_TIMEOUTS)
+#define PER_IRIX32 (0x0008 | STICKY_TIMEOUTS) /* IRIX5 32-bit */
+#define PER_IRIXN32 (0x0009 | STICKY_TIMEOUTS) /* IRIX6 new 32-bit */
+#define PER_IRIX64 (0x000a | STICKY_TIMEOUTS) /* IRIX6 64-bit */
/* Prototype for an lcall7 syscall handler. */
typedef asmlinkage void (*lcall7_func)(struct pt_regs *);
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 42ad7cacb..2bb90e3f5 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -147,6 +147,7 @@ enum scsi_directory_inos {
PROC_SCSI_A2091,
PROC_SCSI_GVP11,
PROC_SCSI_ATARI,
+ PROC_SCSI_SGIWD93,
PROC_SCSI_SCSI_DEBUG,
PROC_SCSI_NOT_PRESENT,
PROC_SCSI_FILE, /* I'm assuming here that we */
diff --git a/include/linux/string.h b/include/linux/string.h
index 214503c20..5eb5cc50a 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -13,7 +13,7 @@ extern "C" {
extern char * ___strtok;
extern char * strcpy(char *,const char *);
-extern char * strncpy(char *,const char *, __kernel_size_t);
+extern char * strncpy(char *,const char *,__kernel_size_t);
extern char * strcat(char *, const char *);
extern char * strncat(char *, const char *, __kernel_size_t);
extern char * strchr(const char *,int);
@@ -27,7 +27,7 @@ extern __kernel_size_t strspn(const char *,const char *);
extern int strcmp(const char *,const char *);
extern int strncmp(const char *,const char *,__kernel_size_t);
-extern void * memset(void *,int,__kernel_size_t);
+extern void * memset(void *,char,__kernel_size_t);
extern void * memcpy(void *,const void *,__kernel_size_t);
extern void * memmove(void *,const void *,__kernel_size_t);
extern void * memscan(void *,int,__kernel_size_t);
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 89e42d849..ae6a063e3 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -17,8 +17,6 @@
#ifndef _LINUX_TCP_H
#define _LINUX_TCP_H
-#include <asm/byteorder.h>
-
#include <linux/types.h>
#include <asm/byteorder.h>
diff --git a/include/linux/time.h b/include/linux/time.h
index 47246a142..7482f8e2e 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -3,10 +3,12 @@
#ifndef _STRUCT_TIMESPEC
#define _STRUCT_TIMESPEC
+#ifdef __KERNEL__
struct timespec {
long tv_sec; /* seconds */
long tv_nsec; /* nanoseconds */
};
+#endif /* (__KERNEL__) */
#endif /* _STRUCT_TIMESPEC */
struct timeval {
@@ -28,11 +30,13 @@ void get_fast_time(struct timeval *tv);
void (*do_get_fast_time)(struct timeval *);
#endif
+#ifdef __KERNEL__
#define FD_SETSIZE __FD_SETSIZE
#define FD_SET(fd,fdsetp) __FD_SET(fd,fdsetp)
#define FD_CLR(fd,fdsetp) __FD_CLR(fd,fdsetp)
#define FD_ISSET(fd,fdsetp) __FD_ISSET(fd,fdsetp)
#define FD_ZERO(fdsetp) __FD_ZERO(fdsetp)
+#endif
/*
* Names of the interval timers, and structure
diff --git a/include/linux/tty.h b/include/linux/tty.h
index c965cd287..04c78e1ae 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -78,6 +78,8 @@ extern struct screen_info screen_info;
#define VIDEO_TYPE_SUN 0x50 /* Sun frame buffer. */
+#define VIDEO_TYPE_SGI 0x60 /* Various SGI graphics hardware */
+
/*
* This character is the same as _POSIX_VDISABLE: it cannot be used as
* a c_cc[] character, but indicates that a particular special character
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 06:37:07 +0000