aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/asm-frv/Kbuild1
-rw-r--r--include/asm-generic/Kbuild.asm3
-rw-r--r--include/asm-s390/kexec.h2
-rw-r--r--include/linux/Kbuild1
-rw-r--r--include/linux/a.out.h8
-rw-r--r--include/linux/shm.h8
6 files changed, 18 insertions, 5 deletions
diff --git a/include/asm-frv/Kbuild b/include/asm-frv/Kbuild
index 966a9836d556..bc3f12c5b7e0 100644
--- a/include/asm-frv/Kbuild
+++ b/include/asm-frv/Kbuild
@@ -4,4 +4,3 @@ header-y += registers.h
4 4
5unifdef-y += termios.h 5unifdef-y += termios.h
6unifdef-y += ptrace.h 6unifdef-y += ptrace.h
7unifdef-y += page.h
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
index d00fd67e6367..57ba60635959 100644
--- a/include/asm-generic/Kbuild.asm
+++ b/include/asm-generic/Kbuild.asm
@@ -27,6 +27,3 @@ unifdef-y += termbits.h
27unifdef-y += termios.h 27unifdef-y += termios.h
28unifdef-y += types.h 28unifdef-y += types.h
29unifdef-y += unistd.h 29unifdef-y += unistd.h
30
31# These probably shouldn't be exported
32unifdef-y += page.h
diff --git a/include/asm-s390/kexec.h b/include/asm-s390/kexec.h
index 7592af708b41..f219c6411e0b 100644
--- a/include/asm-s390/kexec.h
+++ b/include/asm-s390/kexec.h
@@ -10,7 +10,9 @@
10#ifndef _S390_KEXEC_H 10#ifndef _S390_KEXEC_H
11#define _S390_KEXEC_H 11#define _S390_KEXEC_H
12 12
13#ifdef __KERNEL__
13#include <asm/page.h> 14#include <asm/page.h>
15#endif
14#include <asm/processor.h> 16#include <asm/processor.h>
15/* 17/*
16 * KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return. 18 * KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return.
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 0d4f55d97ae9..2ebf068ba504 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -18,7 +18,6 @@ header-y += usb/
18 18
19header-y += affs_hardblocks.h 19header-y += affs_hardblocks.h
20header-y += aio_abi.h 20header-y += aio_abi.h
21header-y += a.out.h
22header-y += arcfb.h 21header-y += arcfb.h
23header-y += atmapi.h 22header-y += atmapi.h
24header-y += atmbr2684.h 23header-y += atmbr2684.h
diff --git a/include/linux/a.out.h b/include/linux/a.out.h
index f913cc3e1b0d..82cd918f2ab7 100644
--- a/include/linux/a.out.h
+++ b/include/linux/a.out.h
@@ -128,12 +128,20 @@ enum machine_type {
128#endif 128#endif
129 129
130#ifdef linux 130#ifdef linux
131#ifdef __KERNEL__
131#include <asm/page.h> 132#include <asm/page.h>
133#else
134#include <unistd.h>
135#endif
132#if defined(__i386__) || defined(__mc68000__) 136#if defined(__i386__) || defined(__mc68000__)
133#define SEGMENT_SIZE 1024 137#define SEGMENT_SIZE 1024
134#else 138#else
135#ifndef SEGMENT_SIZE 139#ifndef SEGMENT_SIZE
140#ifdef __KERNEL__
136#define SEGMENT_SIZE PAGE_SIZE 141#define SEGMENT_SIZE PAGE_SIZE
142#else
143#define SEGMENT_SIZE getpagesize()
144#endif
137#endif 145#endif
138#endif 146#endif
139#endif 147#endif
diff --git a/include/linux/shm.h b/include/linux/shm.h
index eeaed921a1dc..eca6235a46c0 100644
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
@@ -3,7 +3,11 @@
3 3
4#include <linux/ipc.h> 4#include <linux/ipc.h>
5#include <linux/errno.h> 5#include <linux/errno.h>
6#ifdef __KERNEL__
6#include <asm/page.h> 7#include <asm/page.h>
8#else
9#include <unistd.h>
10#endif
7 11
8/* 12/*
9 * SHMMAX, SHMMNI and SHMALL are upper limits are defaults which can 13 * SHMMAX, SHMMNI and SHMALL are upper limits are defaults which can
@@ -13,7 +17,11 @@
13#define SHMMAX 0x2000000 /* max shared seg size (bytes) */ 17#define SHMMAX 0x2000000 /* max shared seg size (bytes) */
14#define SHMMIN 1 /* min shared seg size (bytes) */ 18#define SHMMIN 1 /* min shared seg size (bytes) */
15#define SHMMNI 4096 /* max num of segs system wide */ 19#define SHMMNI 4096 /* max num of segs system wide */
20#ifdef __KERNEL__
16#define SHMALL (SHMMAX/PAGE_SIZE*(SHMMNI/16)) /* max shm system wide (pages) */ 21#define SHMALL (SHMMAX/PAGE_SIZE*(SHMMNI/16)) /* max shm system wide (pages) */
22#else
23#define SHMALL (SHMMAX/getpagesize()*(SHMMNI/16))
24#endif
17#define SHMSEG SHMMNI /* max shared segs per process */ 25#define SHMSEG SHMMNI /* max shared segs per process */
18 26
19#ifdef __KERNEL__ 27#ifdef __KERNEL__