Skip to content

Commit

Permalink
[PATCH] tiny: Make *[ug]id16 support optional
Browse files Browse the repository at this point in the history 
Configurable 16-bit UID and friends support

This allows turning off the legacy 16 bit UID interfaces on embedded platforms.

   text    data     bss     dec     hex filename
3330172  529036  190556 4049764  3dcb64 vmlinux-baseline
3328268  529040  190556 4047864  3dc3f8 vmlinux

From: Adrian Bunk <bunk@stusta.de>

    UID16 was accidentially disabled for !EMBEDDED.

Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Matt Mackall authored and Linus Torvalds committed Jan 9, 2006
1 parent 22c4e30 commit e585e47
Show file tree
Hide file tree
Showing 19 changed files with 28 additions and 65 deletions.
3 changes: 0 additions & 3 deletions arch/alpha/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ config MMU
bool
default y

config UID16
bool

config RWSEM_GENERIC_SPINLOCK
bool

Expand Down
4 changes: 0 additions & 4 deletions arch/arm/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ config MCA
<file:Documentation/mca.txt> (and especially the web page given
there) before attempting to build an MCA bus kernel.

config UID16
bool
default y

config RWSEM_GENERIC_SPINLOCK
bool
default y
Expand Down
4 changes: 0 additions & 4 deletions arch/arm26/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ config FORCE_MAX_ZONEORDER
int
default 9

config UID16
bool
default y

config RWSEM_GENERIC_SPINLOCK
bool
default y
Expand Down
4 changes: 0 additions & 4 deletions arch/cris/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ config MMU
bool
default y

config UID16
bool
default y

config RWSEM_GENERIC_SPINLOCK
bool
default y
Expand Down
4 changes: 0 additions & 4 deletions arch/h8300/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ config FPU
bool
default n

config UID16
bool
default y

config RWSEM_GENERIC_SPINLOCK
bool
default y
Expand Down
4 changes: 0 additions & 4 deletions arch/i386/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ config MMU
config SBUS
bool

config UID16
bool
default y

config GENERIC_ISA_DMA
bool
default y
Expand Down
4 changes: 0 additions & 4 deletions arch/m68k/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ config MMU
bool
default y

config UID16
bool
default y

config RWSEM_GENERIC_SPINLOCK
bool
default y
Expand Down
4 changes: 0 additions & 4 deletions arch/m68knommu/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ config FPU
bool
default n

config UID16
bool
default y

config RWSEM_GENERIC_SPINLOCK
bool
default y
Expand Down
3 changes: 0 additions & 3 deletions arch/parisc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ config MMU
config STACK_GROWSUP
def_bool y

config UID16
bool

config RWSEM_GENERIC_SPINLOCK
def_bool y

Expand Down
3 changes: 0 additions & 3 deletions arch/powerpc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ config MMU
bool
default y

config UID16
bool

config GENERIC_HARDIRQS
bool
default y
Expand Down
3 changes: 0 additions & 3 deletions arch/ppc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ config MMU
bool
default y

config UID16
bool

config GENERIC_HARDIRQS
bool
default y
Expand Down
4 changes: 0 additions & 4 deletions arch/sh/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ config SUPERH
gaming console. The SuperH port has a home page at
<http://www.linux-sh.org/>.

config UID16
bool
default y

config RWSEM_GENERIC_SPINLOCK
bool
default y
Expand Down
4 changes: 0 additions & 4 deletions arch/sparc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ config MMU
bool
default y

config UID16
bool
default y

config HIGHMEM
bool
default y
Expand Down
5 changes: 0 additions & 5 deletions arch/sparc64/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,11 +309,6 @@ config COMPAT
depends on SPARC32_COMPAT
default y

config UID16
bool
depends on SPARC32_COMPAT
default y

config BINFMT_ELF32
tristate "Kernel support for 32-bit ELF binaries"
depends on SPARC32_COMPAT
Expand Down
4 changes: 0 additions & 4 deletions arch/um/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ config SBUS
config PCI
bool

config UID16
bool
default y

config GENERIC_CALIBRATE_DELAY
bool
default y
Expand Down
3 changes: 0 additions & 3 deletions arch/v850/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ mainmenu "uClinux/v850 (w/o MMU) Kernel Configuration"
config MMU
bool
default n
config UID16
bool
default n
config RWSEM_GENERIC_SPINLOCK
bool
default y
Expand Down
5 changes: 0 additions & 5 deletions arch/x86_64/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,11 +542,6 @@ config SYSVIPC_COMPAT
depends on COMPAT && SYSVIPC
default y

config UID16
bool
depends on IA32_EMULATION
default y

endmenu

source "net/Kconfig"
Expand Down
9 changes: 9 additions & 0 deletions init/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,15 @@ config CPUSETS

source "usr/Kconfig"

config UID16
bool "Enable 16-bit UID system calls" if EMBEDDED
depends !ALPHA && !PPC && !PPC64 && !PARISC && !V850 && !ARCH_S390X
depends !X86_64 || IA32_EMULATION
depends !SPARC64 || SPARC32_COMPAT
default y
help
This enables the legacy 16-bit UID syscall wrappers.

config CC_OPTIMIZE_FOR_SIZE
bool "Optimize for size (Look out for broken compilers!)"
default y
Expand Down
19 changes: 19 additions & 0 deletions kernel/sys_ni.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,25 @@ cond_syscall(sys_inotify_init);
cond_syscall(sys_inotify_add_watch);
cond_syscall(sys_inotify_rm_watch);
cond_syscall(sys_migrate_pages);
cond_syscall(sys_chown16);
cond_syscall(sys_fchown16);
cond_syscall(sys_getegid16);
cond_syscall(sys_geteuid16);
cond_syscall(sys_getgid16);
cond_syscall(sys_getgroups16);
cond_syscall(sys_getresgid16);
cond_syscall(sys_getresuid16);
cond_syscall(sys_getuid16);
cond_syscall(sys_lchown16);
cond_syscall(sys_setfsgid16);
cond_syscall(sys_setfsuid16);
cond_syscall(sys_setgid16);
cond_syscall(sys_setgroups16);
cond_syscall(sys_setregid16);
cond_syscall(sys_setresgid16);
cond_syscall(sys_setresuid16);
cond_syscall(sys_setreuid16);
cond_syscall(sys_setuid16);

/* arch-specific weak syscall entries */
cond_syscall(sys_pciconfig_read);
Expand Down

0 comments on commit e585e47

Please sign in to comment.