diff options
Diffstat (limited to 'include/asm-powerpc')
28 files changed, 318 insertions, 79 deletions
diff --git a/include/asm-powerpc/8253pit.h b/include/asm-powerpc/8253pit.h index 862708a749b0..b70d6e53b303 100644 --- a/include/asm-powerpc/8253pit.h +++ b/include/asm-powerpc/8253pit.h | |||
@@ -1,10 +1,10 @@ | |||
1 | #ifndef _ASM_POWERPC_8253PIT_H | ||
2 | #define _ASM_POWERPC_8253PIT_H | ||
3 | |||
1 | /* | 4 | /* |
2 | * 8253/8254 Programmable Interval Timer | 5 | * 8253/8254 Programmable Interval Timer |
3 | */ | 6 | */ |
4 | 7 | ||
5 | #ifndef _8253PIT_H | ||
6 | #define _8253PIT_H | ||
7 | |||
8 | #define PIT_TICK_RATE 1193182UL | 8 | #define PIT_TICK_RATE 1193182UL |
9 | 9 | ||
10 | #endif | 10 | #endif /* _ASM_POWERPC_8253PIT_H */ |
diff --git a/include/asm-powerpc/agp.h b/include/asm-powerpc/agp.h index ca9e423307f4..885b4631a6cf 100644 --- a/include/asm-powerpc/agp.h +++ b/include/asm-powerpc/agp.h | |||
@@ -1,10 +1,8 @@ | |||
1 | #ifndef AGP_H | 1 | #ifndef _ASM_POWERPC_AGP_H |
2 | #define AGP_H 1 | 2 | #define _ASM_POWERPC_AGP_H |
3 | 3 | ||
4 | #include <asm/io.h> | 4 | #include <asm/io.h> |
5 | 5 | ||
6 | /* nothing much needed here */ | ||
7 | |||
8 | #define map_page_into_agp(page) | 6 | #define map_page_into_agp(page) |
9 | #define unmap_page_from_agp(page) | 7 | #define unmap_page_from_agp(page) |
10 | #define flush_agp_mappings() | 8 | #define flush_agp_mappings() |
@@ -20,4 +18,4 @@ | |||
20 | #define free_gatt_pages(table, order) \ | 18 | #define free_gatt_pages(table, order) \ |
21 | free_pages((unsigned long)(table), (order)) | 19 | free_pages((unsigned long)(table), (order)) |
22 | 20 | ||
23 | #endif | 21 | #endif /* _ASM_POWERPC_AGP_H */ |
diff --git a/include/asm-powerpc/bugs.h b/include/asm-powerpc/bugs.h index 310187d0e33a..42fdb73e3068 100644 --- a/include/asm-powerpc/bugs.h +++ b/include/asm-powerpc/bugs.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _POWERPC_BUGS_H | 1 | #ifndef _ASM_POWERPC_BUGS_H |
2 | #define _POWERPC_BUGS_H | 2 | #define _ASM_POWERPC_BUGS_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * This program is free software; you can redistribute it and/or | 5 | * This program is free software; you can redistribute it and/or |
@@ -13,6 +13,6 @@ | |||
13 | * architecture-dependent bugs. | 13 | * architecture-dependent bugs. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | extern void check_bugs(void); | 16 | static inline void check_bugs(void) { } |
17 | 17 | ||
18 | #endif /* _POWERPC_BUGS_H */ | 18 | #endif /* _ASM_POWERPC_BUGS_H */ |
diff --git a/include/asm-powerpc/errno.h b/include/asm-powerpc/errno.h index 19f20bd41ae6..8c145fd17d86 100644 --- a/include/asm-powerpc/errno.h +++ b/include/asm-powerpc/errno.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _PPC_ERRNO_H | 1 | #ifndef _ASM_POWERPC_ERRNO_H |
2 | #define _PPC_ERRNO_H | 2 | #define _ASM_POWERPC_ERRNO_H |
3 | 3 | ||
4 | #include <asm-generic/errno.h> | 4 | #include <asm-generic/errno.h> |
5 | 5 | ||
@@ -8,4 +8,4 @@ | |||
8 | 8 | ||
9 | #define _LAST_ERRNO 516 | 9 | #define _LAST_ERRNO 516 |
10 | 10 | ||
11 | #endif | 11 | #endif /* _ASM_POWERPC_ERRNO_H */ |
diff --git a/include/asm-powerpc/ioctl.h b/include/asm-powerpc/ioctl.h index 93c6acfdd0fd..8eb99848c402 100644 --- a/include/asm-powerpc/ioctl.h +++ b/include/asm-powerpc/ioctl.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _PPC_IOCTL_H | 1 | #ifndef _ASM_POWERPC_IOCTL_H |
2 | #define _PPC_IOCTL_H | 2 | #define _ASM_POWERPC_IOCTL_H |
3 | 3 | ||
4 | 4 | ||
5 | /* | 5 | /* |
@@ -66,4 +66,4 @@ extern unsigned int __invalid_size_argument_for_IOC; | |||
66 | #define IOCSIZE_MASK (_IOC_SIZEMASK << _IOC_SIZESHIFT) | 66 | #define IOCSIZE_MASK (_IOC_SIZEMASK << _IOC_SIZESHIFT) |
67 | #define IOCSIZE_SHIFT (_IOC_SIZESHIFT) | 67 | #define IOCSIZE_SHIFT (_IOC_SIZESHIFT) |
68 | 68 | ||
69 | #endif | 69 | #endif /* _ASM_POWERPC_IOCTL_H */ |
diff --git a/include/asm-powerpc/ioctls.h b/include/asm-powerpc/ioctls.h index f5b7f2b055e7..5b94ff489b8b 100644 --- a/include/asm-powerpc/ioctls.h +++ b/include/asm-powerpc/ioctls.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _ASM_PPC_IOCTLS_H | 1 | #ifndef _ASM_POWERPC_IOCTLS_H |
2 | #define _ASM_PPC_IOCTLS_H | 2 | #define _ASM_POWERPC_IOCTLS_H |
3 | 3 | ||
4 | #include <asm/ioctl.h> | 4 | #include <asm/ioctl.h> |
5 | 5 | ||
@@ -104,4 +104,4 @@ | |||
104 | #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ | 104 | #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ |
105 | #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ | 105 | #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ |
106 | 106 | ||
107 | #endif /* _ASM_PPC_IOCTLS_H */ | 107 | #endif /* _ASM_POWERPC_IOCTLS_H */ |
diff --git a/include/asm-powerpc/linkage.h b/include/asm-powerpc/linkage.h index 291c2d01c44f..e1c4ac1cc4ba 100644 --- a/include/asm-powerpc/linkage.h +++ b/include/asm-powerpc/linkage.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #ifndef __ASM_LINKAGE_H | 1 | #ifndef _ASM_POWERPC_LINKAGE_H |
2 | #define __ASM_LINKAGE_H | 2 | #define _ASM_POWERPC_LINKAGE_H |
3 | 3 | ||
4 | /* Nothing to see here... */ | 4 | /* Nothing to see here... */ |
5 | 5 | ||
6 | #endif | 6 | #endif /* _ASM_POWERPC_LINKAGE_H */ |
diff --git a/include/asm-powerpc/mc146818rtc.h b/include/asm-powerpc/mc146818rtc.h index a5619a2a1393..f2741c8b59a1 100644 --- a/include/asm-powerpc/mc146818rtc.h +++ b/include/asm-powerpc/mc146818rtc.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _POWERPC_MC146818RTC_H | 1 | #ifndef _ASM_POWERPC_MC146818RTC_H |
2 | #define _POWERPC_MC146818RTC_H | 2 | #define _ASM_POWERPC_MC146818RTC_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * Machine dependent access functions for RTC registers. | 5 | * Machine dependent access functions for RTC registers. |
@@ -33,4 +33,4 @@ outb_p((val),RTC_PORT(1)); \ | |||
33 | }) | 33 | }) |
34 | 34 | ||
35 | #endif /* __KERNEL__ */ | 35 | #endif /* __KERNEL__ */ |
36 | #endif /* _POWERPC_MC146818RTC_H */ | 36 | #endif /* _ASM_POWERPC_MC146818RTC_H */ |
diff --git a/include/asm-powerpc/mman.h b/include/asm-powerpc/mman.h index f2d55988d749..f5e5342fcac5 100644 --- a/include/asm-powerpc/mman.h +++ b/include/asm-powerpc/mman.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _POWERPC_MMAN_H | 1 | #ifndef _ASM_POWERPC_MMAN_H |
2 | #define _POWERPC_MMAN_H | 2 | #define _ASM_POWERPC_MMAN_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * This program is free software; you can redistribute it and/or | 5 | * This program is free software; you can redistribute it and/or |
@@ -49,4 +49,4 @@ | |||
49 | #define MAP_ANON MAP_ANONYMOUS | 49 | #define MAP_ANON MAP_ANONYMOUS |
50 | #define MAP_FILE 0 | 50 | #define MAP_FILE 0 |
51 | 51 | ||
52 | #endif /* _POWERPC_MMAN_H */ | 52 | #endif /* _ASM_POWERPC_MMAN_H */ |
diff --git a/include/asm-powerpc/module.h b/include/asm-powerpc/module.h index 4438f4fd6524..7ecd05e03051 100644 --- a/include/asm-powerpc/module.h +++ b/include/asm-powerpc/module.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _POWERPC_MODULE_H | 1 | #ifndef _ASM_POWERPC_MODULE_H |
2 | #define _POWERPC_MODULE_H | 2 | #define _ASM_POWERPC_MODULE_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * This program is free software; you can redistribute it and/or | 5 | * This program is free software; you can redistribute it and/or |
@@ -74,4 +74,4 @@ struct exception_table_entry; | |||
74 | void sort_ex_table(struct exception_table_entry *start, | 74 | void sort_ex_table(struct exception_table_entry *start, |
75 | struct exception_table_entry *finish); | 75 | struct exception_table_entry *finish); |
76 | 76 | ||
77 | #endif /* _POWERPC_MODULE_H */ | 77 | #endif /* _ASM_POWERPC_MODULE_H */ |
diff --git a/include/asm-powerpc/msgbuf.h b/include/asm-powerpc/msgbuf.h new file mode 100644 index 000000000000..dd76743c7537 --- /dev/null +++ b/include/asm-powerpc/msgbuf.h | |||
@@ -0,0 +1,33 @@ | |||
1 | #ifndef _ASM_POWERPC_MSGBUF_H | ||
2 | #define _ASM_POWERPC_MSGBUF_H | ||
3 | |||
4 | /* | ||
5 | * The msqid64_ds structure for the PowerPC architecture. | ||
6 | * Note extra padding because this structure is passed back and forth | ||
7 | * between kernel and user space. | ||
8 | */ | ||
9 | |||
10 | struct msqid64_ds { | ||
11 | struct ipc64_perm msg_perm; | ||
12 | #ifndef __powerpc64__ | ||
13 | unsigned int __unused1; | ||
14 | #endif | ||
15 | __kernel_time_t msg_stime; /* last msgsnd time */ | ||
16 | #ifndef __powerpc64__ | ||
17 | unsigned int __unused2; | ||
18 | #endif | ||
19 | __kernel_time_t msg_rtime; /* last msgrcv time */ | ||
20 | #ifndef __powerpc64__ | ||
21 | unsigned int __unused3; | ||
22 | #endif | ||
23 | __kernel_time_t msg_ctime; /* last change time */ | ||
24 | unsigned long msg_cbytes; /* current number of bytes on queue */ | ||
25 | unsigned long msg_qnum; /* number of messages in queue */ | ||
26 | unsigned long msg_qbytes; /* max number of bytes on queue */ | ||
27 | __kernel_pid_t msg_lspid; /* pid of last msgsnd */ | ||
28 | __kernel_pid_t msg_lrpid; /* last receive pid */ | ||
29 | unsigned long __unused4; | ||
30 | unsigned long __unused5; | ||
31 | }; | ||
32 | |||
33 | #endif /* _ASM_POWERPC_MSGBUF_H */ | ||
diff --git a/include/asm-powerpc/namei.h b/include/asm-powerpc/namei.h index 29c9ec832133..657443474a6a 100644 --- a/include/asm-powerpc/namei.h +++ b/include/asm-powerpc/namei.h | |||
@@ -1,14 +1,14 @@ | |||
1 | #ifndef _ASM_POWERPC_NAMEI_H | ||
2 | #define _ASM_POWERPC_NAMEI_H | ||
3 | |||
4 | #ifdef __KERNEL__ | ||
5 | |||
1 | /* | 6 | /* |
2 | * include/asm-ppc/namei.h | ||
3 | * Adapted from include/asm-alpha/namei.h | 7 | * Adapted from include/asm-alpha/namei.h |
4 | * | 8 | * |
5 | * Included from fs/namei.c | 9 | * Included from fs/namei.c |
6 | */ | 10 | */ |
7 | 11 | ||
8 | #ifdef __KERNEL__ | ||
9 | #ifndef __PPC_NAMEI_H | ||
10 | #define __PPC_NAMEI_H | ||
11 | |||
12 | /* This dummy routine maybe changed to something useful | 12 | /* This dummy routine maybe changed to something useful |
13 | * for /usr/gnemul/ emulation stuff. | 13 | * for /usr/gnemul/ emulation stuff. |
14 | * Look at asm-sparc/namei.h for details. | 14 | * Look at asm-sparc/namei.h for details. |
@@ -16,5 +16,5 @@ | |||
16 | 16 | ||
17 | #define __emul_prefix() NULL | 17 | #define __emul_prefix() NULL |
18 | 18 | ||
19 | #endif /* __PPC_NAMEI_H */ | 19 | #endif /* __KERNEL__ */ |
20 | #endif /* __KERNEL__ */ | 20 | #endif /* _ASM_POWERPC_NAMEI_H */ |
diff --git a/include/asm-powerpc/param.h b/include/asm-powerpc/param.h new file mode 100644 index 000000000000..bdc724f70884 --- /dev/null +++ b/include/asm-powerpc/param.h | |||
@@ -0,0 +1,24 @@ | |||
1 | #ifndef _ASM_POWERPC_PARAM_H | ||
2 | #define _ASM_POWERPC_PARAM_H | ||
3 | |||
4 | #include <linux/config.h> | ||
5 | |||
6 | #ifdef __KERNEL__ | ||
7 | #define HZ CONFIG_HZ /* internal kernel timer frequency */ | ||
8 | #define USER_HZ 100 /* for user interfaces in "ticks" */ | ||
9 | #define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */ | ||
10 | #endif /* __KERNEL__ */ | ||
11 | |||
12 | #ifndef HZ | ||
13 | #define HZ 100 | ||
14 | #endif | ||
15 | |||
16 | #define EXEC_PAGESIZE 4096 | ||
17 | |||
18 | #ifndef NOGROUP | ||
19 | #define NOGROUP (-1) | ||
20 | #endif | ||
21 | |||
22 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ | ||
23 | |||
24 | #endif /* _ASM_POWERPC_PARAM_H */ | ||
diff --git a/include/asm-powerpc/poll.h b/include/asm-powerpc/poll.h index be5024913c62..edd2054da86b 100644 --- a/include/asm-powerpc/poll.h +++ b/include/asm-powerpc/poll.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef __PPC_POLL_H | 1 | #ifndef _ASM_POWERPC_POLL_H |
2 | #define __PPC_POLL_H | 2 | #define _ASM_POWERPC_POLL_H |
3 | 3 | ||
4 | #define POLLIN 0x0001 | 4 | #define POLLIN 0x0001 |
5 | #define POLLPRI 0x0002 | 5 | #define POLLPRI 0x0002 |
@@ -20,4 +20,4 @@ struct pollfd { | |||
20 | short revents; | 20 | short revents; |
21 | }; | 21 | }; |
22 | 22 | ||
23 | #endif | 23 | #endif /* _ASM_POWERPC_POLL_H */ |
diff --git a/include/asm-powerpc/sembuf.h b/include/asm-powerpc/sembuf.h index c98fc18fe805..99a41938ae3d 100644 --- a/include/asm-powerpc/sembuf.h +++ b/include/asm-powerpc/sembuf.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _POWERPC_SEMBUF_H | 1 | #ifndef _ASM_POWERPC_SEMBUF_H |
2 | #define _POWERPC_SEMBUF_H | 2 | #define _ASM_POWERPC_SEMBUF_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * This program is free software; you can redistribute it and/or | 5 | * This program is free software; you can redistribute it and/or |
@@ -33,4 +33,4 @@ struct semid64_ds { | |||
33 | unsigned long __unused4; | 33 | unsigned long __unused4; |
34 | }; | 34 | }; |
35 | 35 | ||
36 | #endif /* _POWERPC_SEMBUF_H */ | 36 | #endif /* _ASM_POWERPC_SEMBUF_H */ |
diff --git a/include/asm-powerpc/setup.h b/include/asm-powerpc/setup.h new file mode 100644 index 000000000000..3d9740aae018 --- /dev/null +++ b/include/asm-powerpc/setup.h | |||
@@ -0,0 +1,9 @@ | |||
1 | #ifndef _ASM_POWERPC_SETUP_H | ||
2 | #define _ASM_POWERPC_SETUP_H | ||
3 | |||
4 | #ifdef __KERNEL__ | ||
5 | |||
6 | #define COMMAND_LINE_SIZE 512 | ||
7 | |||
8 | #endif /* __KERNEL__ */ | ||
9 | #endif /* _ASM_POWERPC_SETUP_H */ | ||
diff --git a/include/asm-powerpc/shmbuf.h b/include/asm-powerpc/shmbuf.h index 29632db3b178..8efa39698b6c 100644 --- a/include/asm-powerpc/shmbuf.h +++ b/include/asm-powerpc/shmbuf.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _POWERPC_SHMBUF_H | 1 | #ifndef _ASM_POWERPC_SHMBUF_H |
2 | #define _POWERPC_SHMBUF_H | 2 | #define _ASM_POWERPC_SHMBUF_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * This program is free software; you can redistribute it and/or | 5 | * This program is free software; you can redistribute it and/or |
@@ -21,19 +21,19 @@ | |||
21 | 21 | ||
22 | struct shmid64_ds { | 22 | struct shmid64_ds { |
23 | struct ipc64_perm shm_perm; /* operation perms */ | 23 | struct ipc64_perm shm_perm; /* operation perms */ |
24 | #ifndef __power64__ | 24 | #ifndef __powerpc64__ |
25 | unsigned long __unused1; | 25 | unsigned long __unused1; |
26 | #endif | 26 | #endif |
27 | __kernel_time_t shm_atime; /* last attach time */ | 27 | __kernel_time_t shm_atime; /* last attach time */ |
28 | #ifndef __power64__ | 28 | #ifndef __powerpc64__ |
29 | unsigned long __unused2; | 29 | unsigned long __unused2; |
30 | #endif | 30 | #endif |
31 | __kernel_time_t shm_dtime; /* last detach time */ | 31 | __kernel_time_t shm_dtime; /* last detach time */ |
32 | #ifndef __power64__ | 32 | #ifndef __powerpc64__ |
33 | unsigned long __unused3; | 33 | unsigned long __unused3; |
34 | #endif | 34 | #endif |
35 | __kernel_time_t shm_ctime; /* last change time */ | 35 | __kernel_time_t shm_ctime; /* last change time */ |
36 | #ifndef __power64__ | 36 | #ifndef __powerpc64__ |
37 | unsigned long __unused4; | 37 | unsigned long __unused4; |
38 | #endif | 38 | #endif |
39 | size_t shm_segsz; /* size of segment (bytes) */ | 39 | size_t shm_segsz; /* size of segment (bytes) */ |
@@ -56,4 +56,4 @@ struct shminfo64 { | |||
56 | unsigned long __unused4; | 56 | unsigned long __unused4; |
57 | }; | 57 | }; |
58 | 58 | ||
59 | #endif /* _POWERPC_SHMBUF_H */ | 59 | #endif /* _ASM_POWERPC_SHMBUF_H */ |
diff --git a/include/asm-powerpc/shmparam.h b/include/asm-powerpc/shmparam.h index d6250602ae64..5cda42a6d39e 100644 --- a/include/asm-powerpc/shmparam.h +++ b/include/asm-powerpc/shmparam.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #ifndef _PPC_SHMPARAM_H | 1 | #ifndef _ASM_POWERPC_SHMPARAM_H |
2 | #define _PPC_SHMPARAM_H | 2 | #define _ASM_POWERPC_SHMPARAM_H |
3 | 3 | ||
4 | #define SHMLBA PAGE_SIZE /* attach addr a multiple of this */ | 4 | #define SHMLBA PAGE_SIZE /* attach addr a multiple of this */ |
5 | 5 | ||
6 | #endif /* _PPC_SHMPARAM_H */ | 6 | #endif /* _ASM_POWERPC_SHMPARAM_H */ |
diff --git a/include/asm-powerpc/siginfo.h b/include/asm-powerpc/siginfo.h index ae70b8010b19..538ea8ef509b 100644 --- a/include/asm-powerpc/siginfo.h +++ b/include/asm-powerpc/siginfo.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _POWERPC_SIGINFO_H | 1 | #ifndef _ASM_POWERPC_SIGINFO_H |
2 | #define _POWERPC_SIGINFO_H | 2 | #define _ASM_POWERPC_SIGINFO_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * This program is free software; you can redistribute it and/or | 5 | * This program is free software; you can redistribute it and/or |
@@ -15,4 +15,4 @@ | |||
15 | 15 | ||
16 | #include <asm-generic/siginfo.h> | 16 | #include <asm-generic/siginfo.h> |
17 | 17 | ||
18 | #endif /* _POWERPC_SIGINFO_H */ | 18 | #endif /* _ASM_POWERPC_SIGINFO_H */ |
diff --git a/include/asm-powerpc/socket.h b/include/asm-powerpc/socket.h index 51a0cf5ee9f0..e4b8177d4acc 100644 --- a/include/asm-powerpc/socket.h +++ b/include/asm-powerpc/socket.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _POWERPC_SOCKET_H | 1 | #ifndef _ASM_POWERPC_SOCKET_H |
2 | #define _POWERPC_SOCKET_H | 2 | #define _ASM_POWERPC_SOCKET_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * This program is free software; you can redistribute it and/or | 5 | * This program is free software; you can redistribute it and/or |
@@ -56,4 +56,4 @@ | |||
56 | 56 | ||
57 | #define SO_PEERSEC 31 | 57 | #define SO_PEERSEC 31 |
58 | 58 | ||
59 | #endif /* _POWERPC_SOCKET_H */ | 59 | #endif /* _ASM_POWERPC_SOCKET_H */ |
diff --git a/include/asm-powerpc/sockios.h b/include/asm-powerpc/sockios.h index ef7ff664167e..590078d8ed28 100644 --- a/include/asm-powerpc/sockios.h +++ b/include/asm-powerpc/sockios.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _POWERPC_SOCKIOS_H | 1 | #ifndef _ASM_POWERPC_SOCKIOS_H |
2 | #define _POWERPC_SOCKIOS_H | 2 | #define _ASM_POWERPC_SOCKIOS_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * This program is free software; you can redistribute it and/or | 5 | * This program is free software; you can redistribute it and/or |
@@ -16,4 +16,4 @@ | |||
16 | #define SIOCATMARK 0x8905 | 16 | #define SIOCATMARK 0x8905 |
17 | #define SIOCGSTAMP 0x8906 /* Get stamp */ | 17 | #define SIOCGSTAMP 0x8906 /* Get stamp */ |
18 | 18 | ||
19 | #endif /* _POWERPC_SOCKIOS_H */ | 19 | #endif /* _ASM_POWERPC_SOCKIOS_H */ |
diff --git a/include/asm-powerpc/string.h b/include/asm-powerpc/string.h index 225575997392..8606a696c088 100644 --- a/include/asm-powerpc/string.h +++ b/include/asm-powerpc/string.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _PPC_STRING_H_ | 1 | #ifndef _ASM_POWERPC_STRING_H |
2 | #define _PPC_STRING_H_ | 2 | #define _ASM_POWERPC_STRING_H |
3 | 3 | ||
4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
5 | 5 | ||
@@ -29,4 +29,4 @@ extern void * memchr(const void *,int,__kernel_size_t); | |||
29 | 29 | ||
30 | #endif /* __KERNEL__ */ | 30 | #endif /* __KERNEL__ */ |
31 | 31 | ||
32 | #endif | 32 | #endif /* _ASM_POWERPC_STRING_H */ |
diff --git a/include/asm-powerpc/termbits.h b/include/asm-powerpc/termbits.h index 2c5bf85a8c3c..ebf6055481dc 100644 --- a/include/asm-powerpc/termbits.h +++ b/include/asm-powerpc/termbits.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _POWERPC_TERMBITS_H | 1 | #ifndef _ASM_POWERPC_TERMBITS_H |
2 | #define _POWERPC_TERMBITS_H | 2 | #define _ASM_POWERPC_TERMBITS_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * This program is free software; you can redistribute it and/or | 5 | * This program is free software; you can redistribute it and/or |
@@ -188,4 +188,4 @@ struct termios { | |||
188 | #define TCSADRAIN 1 | 188 | #define TCSADRAIN 1 |
189 | #define TCSAFLUSH 2 | 189 | #define TCSAFLUSH 2 |
190 | 190 | ||
191 | #endif /* _POWERPC_TERMBITS_H */ | 191 | #endif /* _ASM_POWERPC_TERMBITS_H */ |
diff --git a/include/asm-powerpc/termios.h b/include/asm-powerpc/termios.h index 237533bb0e9f..c5b8e5358f83 100644 --- a/include/asm-powerpc/termios.h +++ b/include/asm-powerpc/termios.h | |||
@@ -1,5 +1,5 @@ | |||
1 | #ifndef _POWERPC_TERMIOS_H | 1 | #ifndef _ASM_POWERPC_TERMIOS_H |
2 | #define _POWERPC_TERMIOS_H | 2 | #define _ASM_POWERPC_TERMIOS_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * Liberally adapted from alpha/termios.h. In particular, the c_cc[] | 5 | * Liberally adapted from alpha/termios.h. In particular, the c_cc[] |
@@ -233,4 +233,4 @@ struct termio { | |||
233 | 233 | ||
234 | #endif /* __KERNEL__ */ | 234 | #endif /* __KERNEL__ */ |
235 | 235 | ||
236 | #endif /* _POWERPC_TERMIOS_H */ | 236 | #endif /* _ASM_POWERPC_TERMIOS_H */ |
diff --git a/include/asm-powerpc/timex.h b/include/asm-powerpc/timex.h new file mode 100644 index 000000000000..51c5b316be55 --- /dev/null +++ b/include/asm-powerpc/timex.h | |||
@@ -0,0 +1,49 @@ | |||
1 | #ifndef _ASM_POWERPC_TIMEX_H | ||
2 | #define _ASM_POWERPC_TIMEX_H | ||
3 | |||
4 | #ifdef __KERNEL__ | ||
5 | |||
6 | /* | ||
7 | * PowerPC architecture timex specifications | ||
8 | */ | ||
9 | |||
10 | #include <linux/config.h> | ||
11 | #include <asm/cputable.h> | ||
12 | |||
13 | #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ | ||
14 | |||
15 | typedef unsigned long cycles_t; | ||
16 | |||
17 | static inline cycles_t get_cycles(void) | ||
18 | { | ||
19 | cycles_t ret; | ||
20 | |||
21 | #ifdef __powerpc64__ | ||
22 | |||
23 | __asm__ __volatile__("mftb %0" : "=r" (ret) : ); | ||
24 | |||
25 | #else | ||
26 | /* | ||
27 | * For the "cycle" counter we use the timebase lower half. | ||
28 | * Currently only used on SMP. | ||
29 | */ | ||
30 | |||
31 | ret = 0; | ||
32 | |||
33 | __asm__ __volatile__( | ||
34 | "98: mftb %0\n" | ||
35 | "99:\n" | ||
36 | ".section __ftr_fixup,\"a\"\n" | ||
37 | " .long %1\n" | ||
38 | " .long 0\n" | ||
39 | " .long 98b\n" | ||
40 | " .long 99b\n" | ||
41 | ".previous" | ||
42 | : "=r" (ret) : "i" (CPU_FTR_601)); | ||
43 | #endif | ||
44 | |||
45 | return ret; | ||
46 | } | ||
47 | |||
48 | #endif /* __KERNEL__ */ | ||
49 | #endif /* _ASM_POWERPC_TIMEX_H */ | ||
diff --git a/include/asm-powerpc/topology.h b/include/asm-powerpc/topology.h new file mode 100644 index 000000000000..2512e3836bf4 --- /dev/null +++ b/include/asm-powerpc/topology.h | |||
@@ -0,0 +1,70 @@ | |||
1 | #ifndef _ASM_POWERPC_TOPOLOGY_H | ||
2 | #define _ASM_POWERPC_TOPOLOGY_H | ||
3 | |||
4 | #include <linux/config.h> | ||
5 | |||
6 | #ifdef CONFIG_NUMA | ||
7 | |||
8 | #include <asm/mmzone.h> | ||
9 | |||
10 | static inline int cpu_to_node(int cpu) | ||
11 | { | ||
12 | int node; | ||
13 | |||
14 | node = numa_cpu_lookup_table[cpu]; | ||
15 | |||
16 | #ifdef DEBUG_NUMA | ||
17 | BUG_ON(node == -1); | ||
18 | #endif | ||
19 | |||
20 | return node; | ||
21 | } | ||
22 | |||
23 | #define parent_node(node) (node) | ||
24 | |||
25 | static inline cpumask_t node_to_cpumask(int node) | ||
26 | { | ||
27 | return numa_cpumask_lookup_table[node]; | ||
28 | } | ||
29 | |||
30 | static inline int node_to_first_cpu(int node) | ||
31 | { | ||
32 | cpumask_t tmp; | ||
33 | tmp = node_to_cpumask(node); | ||
34 | return first_cpu(tmp); | ||
35 | } | ||
36 | |||
37 | #define pcibus_to_node(node) (-1) | ||
38 | #define pcibus_to_cpumask(bus) (cpu_online_map) | ||
39 | |||
40 | #define nr_cpus_node(node) (nr_cpus_in_node[node]) | ||
41 | |||
42 | /* sched_domains SD_NODE_INIT for PPC64 machines */ | ||
43 | #define SD_NODE_INIT (struct sched_domain) { \ | ||
44 | .span = CPU_MASK_NONE, \ | ||
45 | .parent = NULL, \ | ||
46 | .groups = NULL, \ | ||
47 | .min_interval = 8, \ | ||
48 | .max_interval = 32, \ | ||
49 | .busy_factor = 32, \ | ||
50 | .imbalance_pct = 125, \ | ||
51 | .cache_hot_time = (10*1000000), \ | ||
52 | .cache_nice_tries = 1, \ | ||
53 | .per_cpu_gain = 100, \ | ||
54 | .flags = SD_LOAD_BALANCE \ | ||
55 | | SD_BALANCE_EXEC \ | ||
56 | | SD_BALANCE_NEWIDLE \ | ||
57 | | SD_WAKE_IDLE \ | ||
58 | | SD_WAKE_BALANCE, \ | ||
59 | .last_balance = jiffies, \ | ||
60 | .balance_interval = 1, \ | ||
61 | .nr_balance_failed = 0, \ | ||
62 | } | ||
63 | |||
64 | #else | ||
65 | |||
66 | #include <asm-generic/topology.h> | ||
67 | |||
68 | #endif /* CONFIG_NUMA */ | ||
69 | |||
70 | #endif /* _ASM_POWERPC_TOPOLOGY_H */ | ||
diff --git a/include/asm-powerpc/unaligned.h b/include/asm-powerpc/unaligned.h index 45520d9b85d1..6c95dfa2652f 100644 --- a/include/asm-powerpc/unaligned.h +++ b/include/asm-powerpc/unaligned.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef _ASM_POWERPC_UNALIGNED_H | ||
2 | #define _ASM_POWERPC_UNALIGNED_H | ||
3 | |||
1 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
2 | #ifndef __PPC_UNALIGNED_H | ||
3 | #define __PPC_UNALIGNED_H | ||
4 | 5 | ||
5 | /* | 6 | /* |
6 | * The PowerPC can do unaligned accesses itself in big endian mode. | 7 | * The PowerPC can do unaligned accesses itself in big endian mode. |
@@ -14,5 +15,5 @@ | |||
14 | 15 | ||
15 | #define put_unaligned(val, ptr) ((void)( *(ptr) = (val) )) | 16 | #define put_unaligned(val, ptr) ((void)( *(ptr) = (val) )) |
16 | 17 | ||
17 | #endif | 18 | #endif /* __KERNEL__ */ |
18 | #endif /* __KERNEL__ */ | 19 | #endif /* _ASM_POWERPC_UNALIGNED_H */ |
diff --git a/include/asm-powerpc/user.h b/include/asm-powerpc/user.h new file mode 100644 index 000000000000..e59ade4b3dfb --- /dev/null +++ b/include/asm-powerpc/user.h | |||
@@ -0,0 +1,55 @@ | |||
1 | #ifndef _ASM_POWERPC_USER_H | ||
2 | #define _ASM_POWERPC_USER_H | ||
3 | |||
4 | #ifdef __KERNEL__ | ||
5 | |||
6 | #include <asm/ptrace.h> | ||
7 | #include <asm/page.h> | ||
8 | |||
9 | /* | ||
10 | * Adapted from <asm-alpha/user.h> | ||
11 | * | ||
12 | * Core file format: The core file is written in such a way that gdb | ||
13 | * can understand it and provide useful information to the user (under | ||
14 | * linux we use the `trad-core' bfd, NOT the osf-core). The file contents | ||
15 | * are as follows: | ||
16 | * | ||
17 | * upage: 1 page consisting of a user struct that tells gdb | ||
18 | * what is present in the file. Directly after this is a | ||
19 | * copy of the task_struct, which is currently not used by gdb, | ||
20 | * but it may come in handy at some point. All of the registers | ||
21 | * are stored as part of the upage. The upage should always be | ||
22 | * only one page long. | ||
23 | * data: The data segment follows next. We use current->end_text to | ||
24 | * current->brk to pick up all of the user variables, plus any memory | ||
25 | * that may have been sbrk'ed. No attempt is made to determine if a | ||
26 | * page is demand-zero or if a page is totally unused, we just cover | ||
27 | * the entire range. All of the addresses are rounded in such a way | ||
28 | * that an integral number of pages is written. | ||
29 | * stack: We need the stack information in order to get a meaningful | ||
30 | * backtrace. We need to write the data from usp to | ||
31 | * current->start_stack, so we round each of these in order to be able | ||
32 | * to write an integer number of pages. | ||
33 | */ | ||
34 | struct user { | ||
35 | struct pt_regs regs; /* entire machine state */ | ||
36 | size_t u_tsize; /* text size (pages) */ | ||
37 | size_t u_dsize; /* data size (pages) */ | ||
38 | size_t u_ssize; /* stack size (pages) */ | ||
39 | unsigned long start_code; /* text starting address */ | ||
40 | unsigned long start_data; /* data starting address */ | ||
41 | unsigned long start_stack; /* stack starting address */ | ||
42 | long int signal; /* signal causing core dump */ | ||
43 | struct regs * u_ar0; /* help gdb find registers */ | ||
44 | unsigned long magic; /* identifies a core file */ | ||
45 | char u_comm[32]; /* user command name */ | ||
46 | }; | ||
47 | |||
48 | #define NBPG PAGE_SIZE | ||
49 | #define UPAGES 1 | ||
50 | #define HOST_TEXT_START_ADDR (u.start_code) | ||
51 | #define HOST_DATA_START_ADDR (u.start_data) | ||
52 | #define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) | ||
53 | |||
54 | #endif /* __KERNEL__ */ | ||
55 | #endif /* _ASM_POWERPC_USER_H */ | ||