aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sys.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 01:11:30 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 01:11:30 -0400
commit45c091bb2d453ce4a8b06cf19872ec7a77fc4799 (patch)
tree06fb2e05518ebfba163f8424e028e7faf5672d66 /kernel/sys.c
parentd588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff)
parent2191fe3e39159e3375f4b7ec1420df149f154101 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits) [POWERPC] re-enable OProfile for iSeries, using timer interrupt [POWERPC] support ibm,extended-*-frequency properties [POWERPC] Extra sanity check in EEH code [POWERPC] Dont look for class-code in pci children [POWERPC] Fix mdelay badness on shared processor partitions [POWERPC] disable floating point exceptions for init [POWERPC] Unify ppc syscall tables [POWERPC] mpic: add support for serial mode interrupts [POWERPC] pseries: Print PCI slot location code on failure [POWERPC] spufs: one more fix for 64k pages [POWERPC] spufs: fail spu_create with invalid flags [POWERPC] spufs: clear class2 interrupt status before wakeup [POWERPC] spufs: fix Makefile for "make clean" [POWERPC] spufs: remove stop_code from struct spu [POWERPC] spufs: fix spu irq affinity setting [POWERPC] spufs: further abstract priv1 register access [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts [POWERPC] spufs: dont try to access SPE channel 1 count [POWERPC] spufs: use kzalloc in create_spu [POWERPC] spufs: fix initial state of wbox file ... Manually resolved conflicts in: drivers/net/phy/Makefile include/asm-powerpc/spu.h
Diffstat (limited to 'kernel/sys.c')
-rw-r--r--kernel/sys.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/kernel/sys.c b/kernel/sys.c
index fc9ebbbaba0c..a57a00597ce0 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -57,6 +57,12 @@
57#ifndef GET_FPEXC_CTL 57#ifndef GET_FPEXC_CTL
58# define GET_FPEXC_CTL(a,b) (-EINVAL) 58# define GET_FPEXC_CTL(a,b) (-EINVAL)
59#endif 59#endif
60#ifndef GET_ENDIAN
61# define GET_ENDIAN(a,b) (-EINVAL)
62#endif
63#ifndef SET_ENDIAN
64# define SET_ENDIAN(a,b) (-EINVAL)
65#endif
60 66
61/* 67/*
62 * this is where the system-wide overflow UID and GID are defined, for 68 * this is where the system-wide overflow UID and GID are defined, for
@@ -2045,6 +2051,13 @@ asmlinkage long sys_prctl(int option, unsigned long arg2, unsigned long arg3,
2045 return -EFAULT; 2051 return -EFAULT;
2046 return 0; 2052 return 0;
2047 } 2053 }
2054 case PR_GET_ENDIAN:
2055 error = GET_ENDIAN(current, arg2);
2056 break;
2057 case PR_SET_ENDIAN:
2058 error = SET_ENDIAN(current, arg2);
2059 break;
2060
2048 default: 2061 default:
2049 error = -EINVAL; 2062 error = -EINVAL;
2050 break; 2063 break;