Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jan 2009 18:33:01 +0000 (10:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jan 2009 18:33:01 +0000 (10:33 -0800)
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k,m68knommu: merge header files

Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild

1  2 
Makefile
arch/m68k/include/asm/Kbuild
arch/m68k/include/asm/byteorder_mm.h
arch/m68k/include/asm/byteorder_no.h
arch/m68k/include/asm/unistd_mm.h

diff --cc Makefile
Simple merge
index 0000000000000000000000000000000000000000,52fd96b4142a47b1541a7d9a5f6549581d6c8377..1a922fad76f753aa66e8d212828935861892865a
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,3 +1,2 @@@
 -unifdef-y += swab.h
+ include include/asm-generic/Kbuild.asm
+ header-y += cachectl.h
index 0000000000000000000000000000000000000000,300866523b8622062bbb42839762c7c9fd7457d7..31b260a88803b97afecd337a9bbe509f48f2d51e
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,7 +1,6 @@@
 -#include <asm/swab.h>
+ #ifndef _M68K_BYTEORDER_H
+ #define _M68K_BYTEORDER_H
+ #include <linux/byteorder/big_endian.h>
+ #endif /* _M68K_BYTEORDER_H */
index 0000000000000000000000000000000000000000,a6f0b8f7f6227d63e3a21700e17fd08e090ffe14..9c6c76a1504177e49a8676f811bed2e9a9e69a1b
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,7 +1,6 @@@
 -#include <asm/swab.h>
+ #ifndef _M68KNOMMU_BYTEORDER_H
+ #define _M68KNOMMU_BYTEORDER_H
+ #include <linux/byteorder/big_endian.h>
+ #endif /* _M68KNOMMU_BYTEORDER_H */
index 0000000000000000000000000000000000000000,965abb8bc7ff7297d565ad1d2c710acb05373baa..3c19027331faa0cc9d1ec9a6195096a112434a2a
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,374 +1,372 @@@
 -/* whitelist for checksyscalls */
 -#define __IGNORE_restart_syscall
 -
+ #ifndef _ASM_M68K_UNISTD_H_
+ #define _ASM_M68K_UNISTD_H_
+ /*
+  * This file contains the system call numbers.
+  */
++#define __NR_restart_syscall    0
+ #define __NR_exit               1
+ #define __NR_fork               2
+ #define __NR_read               3
+ #define __NR_write              4
+ #define __NR_open               5
+ #define __NR_close              6
+ #define __NR_waitpid            7
+ #define __NR_creat              8
+ #define __NR_link               9
+ #define __NR_unlink            10
+ #define __NR_execve            11
+ #define __NR_chdir             12
+ #define __NR_time              13
+ #define __NR_mknod             14
+ #define __NR_chmod             15
+ #define __NR_chown             16
+ #define __NR_break             17
+ #define __NR_oldstat           18
+ #define __NR_lseek             19
+ #define __NR_getpid            20
+ #define __NR_mount             21
+ #define __NR_umount            22
+ #define __NR_setuid            23
+ #define __NR_getuid            24
+ #define __NR_stime             25
+ #define __NR_ptrace            26
+ #define __NR_alarm             27
+ #define __NR_oldfstat          28
+ #define __NR_pause             29
+ #define __NR_utime             30
+ #define __NR_stty              31
+ #define __NR_gtty              32
+ #define __NR_access            33
+ #define __NR_nice              34
+ #define __NR_ftime             35
+ #define __NR_sync              36
+ #define __NR_kill              37
+ #define __NR_rename            38
+ #define __NR_mkdir             39
+ #define __NR_rmdir             40
+ #define __NR_dup               41
+ #define __NR_pipe              42
+ #define __NR_times             43
+ #define __NR_prof              44
+ #define __NR_brk               45
+ #define __NR_setgid            46
+ #define __NR_getgid            47
+ #define __NR_signal            48
+ #define __NR_geteuid           49
+ #define __NR_getegid           50
+ #define __NR_acct              51
+ #define __NR_umount2           52
+ #define __NR_lock              53
+ #define __NR_ioctl             54
+ #define __NR_fcntl             55
+ #define __NR_mpx               56
+ #define __NR_setpgid           57
+ #define __NR_ulimit            58
+ #define __NR_oldolduname       59
+ #define __NR_umask             60
+ #define __NR_chroot            61
+ #define __NR_ustat             62
+ #define __NR_dup2              63
+ #define __NR_getppid           64
+ #define __NR_getpgrp           65
+ #define __NR_setsid            66
+ #define __NR_sigaction                 67
+ #define __NR_sgetmask          68
+ #define __NR_ssetmask          69
+ #define __NR_setreuid          70
+ #define __NR_setregid          71
+ #define __NR_sigsuspend                72
+ #define __NR_sigpending                73
+ #define __NR_sethostname       74
+ #define __NR_setrlimit                 75
+ #define __NR_getrlimit                 76
+ #define __NR_getrusage                 77
+ #define __NR_gettimeofday      78
+ #define __NR_settimeofday      79
+ #define __NR_getgroups                 80
+ #define __NR_setgroups                 81
+ #define __NR_select            82
+ #define __NR_symlink           83
+ #define __NR_oldlstat          84
+ #define __NR_readlink          85
+ #define __NR_uselib            86
+ #define __NR_swapon            87
+ #define __NR_reboot            88
+ #define __NR_readdir           89
+ #define __NR_mmap              90
+ #define __NR_munmap            91
+ #define __NR_truncate          92
+ #define __NR_ftruncate                 93
+ #define __NR_fchmod            94
+ #define __NR_fchown            95
+ #define __NR_getpriority       96
+ #define __NR_setpriority       97
+ #define __NR_profil            98
+ #define __NR_statfs            99
+ #define __NR_fstatfs          100
+ #define __NR_ioperm           101
+ #define __NR_socketcall               102
+ #define __NR_syslog           103
+ #define __NR_setitimer                104
+ #define __NR_getitimer                105
+ #define __NR_stat             106
+ #define __NR_lstat            107
+ #define __NR_fstat            108
+ #define __NR_olduname         109
+ #define __NR_iopl             /* 110 */ not supported
+ #define __NR_vhangup          111
+ #define __NR_idle             /* 112 */ Obsolete
+ #define __NR_vm86             /* 113 */ not supported
+ #define __NR_wait4            114
+ #define __NR_swapoff          115
+ #define __NR_sysinfo          116
+ #define __NR_ipc              117
+ #define __NR_fsync            118
+ #define __NR_sigreturn                119
+ #define __NR_clone            120
+ #define __NR_setdomainname    121
+ #define __NR_uname            122
+ #define __NR_cacheflush               123
+ #define __NR_adjtimex         124
+ #define __NR_mprotect         125
+ #define __NR_sigprocmask      126
+ #define __NR_create_module    127
+ #define __NR_init_module      128
+ #define __NR_delete_module    129
+ #define __NR_get_kernel_syms  130
+ #define __NR_quotactl         131
+ #define __NR_getpgid          132
+ #define __NR_fchdir           133
+ #define __NR_bdflush          134
+ #define __NR_sysfs            135
+ #define __NR_personality      136
+ #define __NR_afs_syscall      137 /* Syscall for Andrew File System */
+ #define __NR_setfsuid         138
+ #define __NR_setfsgid         139
+ #define __NR__llseek          140
+ #define __NR_getdents         141
+ #define __NR__newselect               142
+ #define __NR_flock            143
+ #define __NR_msync            144
+ #define __NR_readv            145
+ #define __NR_writev           146
+ #define __NR_getsid           147
+ #define __NR_fdatasync                148
+ #define __NR__sysctl          149
+ #define __NR_mlock            150
+ #define __NR_munlock          151
+ #define __NR_mlockall         152
+ #define __NR_munlockall               153
+ #define __NR_sched_setparam           154
+ #define __NR_sched_getparam           155
+ #define __NR_sched_setscheduler               156
+ #define __NR_sched_getscheduler               157
+ #define __NR_sched_yield              158
+ #define __NR_sched_get_priority_max   159
+ #define __NR_sched_get_priority_min   160
+ #define __NR_sched_rr_get_interval    161
+ #define __NR_nanosleep                162
+ #define __NR_mremap           163
+ #define __NR_setresuid                164
+ #define __NR_getresuid                165
+ #define __NR_getpagesize      166
+ #define __NR_query_module     167
+ #define __NR_poll             168
+ #define __NR_nfsservctl               169
+ #define __NR_setresgid                170
+ #define __NR_getresgid                171
+ #define __NR_prctl            172
+ #define __NR_rt_sigreturn     173
+ #define __NR_rt_sigaction     174
+ #define __NR_rt_sigprocmask   175
+ #define __NR_rt_sigpending    176
+ #define __NR_rt_sigtimedwait  177
+ #define __NR_rt_sigqueueinfo  178
+ #define __NR_rt_sigsuspend    179
+ #define __NR_pread64          180
+ #define __NR_pwrite64         181
+ #define __NR_lchown           182
+ #define __NR_getcwd           183
+ #define __NR_capget           184
+ #define __NR_capset           185
+ #define __NR_sigaltstack      186
+ #define __NR_sendfile         187
+ #define __NR_getpmsg          188     /* some people actually want streams */
+ #define __NR_putpmsg          189     /* some people actually want streams */
+ #define __NR_vfork            190
+ #define __NR_ugetrlimit               191
+ #define __NR_mmap2            192
+ #define __NR_truncate64               193
+ #define __NR_ftruncate64      194
+ #define __NR_stat64           195
+ #define __NR_lstat64          196
+ #define __NR_fstat64          197
+ #define __NR_chown32          198
+ #define __NR_getuid32         199
+ #define __NR_getgid32         200
+ #define __NR_geteuid32                201
+ #define __NR_getegid32                202
+ #define __NR_setreuid32               203
+ #define __NR_setregid32               204
+ #define __NR_getgroups32      205
+ #define __NR_setgroups32      206
+ #define __NR_fchown32         207
+ #define __NR_setresuid32      208
+ #define __NR_getresuid32      209
+ #define __NR_setresgid32      210
+ #define __NR_getresgid32      211
+ #define __NR_lchown32         212
+ #define __NR_setuid32         213
+ #define __NR_setgid32         214
+ #define __NR_setfsuid32               215
+ #define __NR_setfsgid32               216
+ #define __NR_pivot_root               217
+ #define __NR_getdents64               220
+ #define __NR_gettid           221
+ #define __NR_tkill            222
+ #define __NR_setxattr         223
+ #define __NR_lsetxattr                224
+ #define __NR_fsetxattr                225
+ #define __NR_getxattr         226
+ #define __NR_lgetxattr                227
+ #define __NR_fgetxattr                228
+ #define __NR_listxattr                229
+ #define __NR_llistxattr               230
+ #define __NR_flistxattr               231
+ #define __NR_removexattr      232
+ #define __NR_lremovexattr     233
+ #define __NR_fremovexattr     234
+ #define __NR_futex            235
+ #define __NR_sendfile64               236
+ #define __NR_mincore          237
+ #define __NR_madvise          238
+ #define __NR_fcntl64          239
+ #define __NR_readahead                240
+ #define __NR_io_setup         241
+ #define __NR_io_destroy               242
+ #define __NR_io_getevents     243
+ #define __NR_io_submit                244
+ #define __NR_io_cancel                245
+ #define __NR_fadvise64                246
+ #define __NR_exit_group               247
+ #define __NR_lookup_dcookie   248
+ #define __NR_epoll_create     249
+ #define __NR_epoll_ctl                250
+ #define __NR_epoll_wait               251
+ #define __NR_remap_file_pages 252
+ #define __NR_set_tid_address  253
+ #define __NR_timer_create     254
+ #define __NR_timer_settime    255
+ #define __NR_timer_gettime    256
+ #define __NR_timer_getoverrun 257
+ #define __NR_timer_delete     258
+ #define __NR_clock_settime    259
+ #define __NR_clock_gettime    260
+ #define __NR_clock_getres     261
+ #define __NR_clock_nanosleep  262
+ #define __NR_statfs64         263
+ #define __NR_fstatfs64                264
+ #define __NR_tgkill           265
+ #define __NR_utimes           266
+ #define __NR_fadvise64_64     267
+ #define __NR_mbind            268
+ #define __NR_get_mempolicy    269
+ #define __NR_set_mempolicy    270
+ #define __NR_mq_open          271
+ #define __NR_mq_unlink                272
+ #define __NR_mq_timedsend     273
+ #define __NR_mq_timedreceive  274
+ #define __NR_mq_notify                275
+ #define __NR_mq_getsetattr    276
+ #define __NR_waitid           277
+ #define __NR_vserver          278
+ #define __NR_add_key          279
+ #define __NR_request_key      280
+ #define __NR_keyctl           281
+ #define __NR_ioprio_set               282
+ #define __NR_ioprio_get               283
+ #define __NR_inotify_init     284
+ #define __NR_inotify_add_watch        285
+ #define __NR_inotify_rm_watch 286
+ #define __NR_migrate_pages    287
+ #define __NR_openat           288
+ #define __NR_mkdirat          289
+ #define __NR_mknodat          290
+ #define __NR_fchownat         291
+ #define __NR_futimesat                292
+ #define __NR_fstatat64                293
+ #define __NR_unlinkat         294
+ #define __NR_renameat         295
+ #define __NR_linkat           296
+ #define __NR_symlinkat                297
+ #define __NR_readlinkat               298
+ #define __NR_fchmodat         299
+ #define __NR_faccessat                300
+ #define __NR_pselect6         301
+ #define __NR_ppoll            302
+ #define __NR_unshare          303
+ #define __NR_set_robust_list  304
+ #define __NR_get_robust_list  305
+ #define __NR_splice           306
+ #define __NR_sync_file_range  307
+ #define __NR_tee              308
+ #define __NR_vmsplice         309
+ #define __NR_move_pages               310
+ #define __NR_sched_setaffinity        311
+ #define __NR_sched_getaffinity        312
+ #define __NR_kexec_load               313
+ #define __NR_getcpu           314
+ #define __NR_epoll_pwait      315
+ #define __NR_utimensat                316
+ #define __NR_signalfd         317
+ #define __NR_timerfd_create   318
+ #define __NR_eventfd          319
+ #define __NR_fallocate                320
+ #define __NR_timerfd_settime  321
+ #define __NR_timerfd_gettime  322
+ #define __NR_signalfd4                323
+ #define __NR_eventfd2         324
+ #define __NR_epoll_create1    325
+ #define __NR_dup3             326
+ #define __NR_pipe2            327
+ #define __NR_inotify_init1    328
+ #ifdef __KERNEL__
+ #define NR_syscalls           329
+ #define __ARCH_WANT_IPC_PARSE_VERSION
+ #define __ARCH_WANT_OLD_READDIR
+ #define __ARCH_WANT_OLD_STAT
+ #define __ARCH_WANT_STAT64
+ #define __ARCH_WANT_SYS_ALARM
+ #define __ARCH_WANT_SYS_GETHOSTNAME
+ #define __ARCH_WANT_SYS_PAUSE
+ #define __ARCH_WANT_SYS_SGETMASK
+ #define __ARCH_WANT_SYS_SIGNAL
+ #define __ARCH_WANT_SYS_TIME
+ #define __ARCH_WANT_SYS_UTIME
+ #define __ARCH_WANT_SYS_WAITPID
+ #define __ARCH_WANT_SYS_SOCKETCALL
+ #define __ARCH_WANT_SYS_FADVISE64
+ #define __ARCH_WANT_SYS_GETPGRP
+ #define __ARCH_WANT_SYS_LLSEEK
+ #define __ARCH_WANT_SYS_NICE
+ #define __ARCH_WANT_SYS_OLD_GETRLIMIT
+ #define __ARCH_WANT_SYS_OLDUMOUNT
+ #define __ARCH_WANT_SYS_SIGPENDING
+ #define __ARCH_WANT_SYS_SIGPROCMASK
+ #define __ARCH_WANT_SYS_RT_SIGACTION
+ /*
+  * "Conditional" syscalls
+  *
+  * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
+  * but it doesn't work on all toolchains, so we just do it by hand
+  */
+ #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
+ #endif /* __KERNEL__ */
+ #endif /* _ASM_M68K_UNISTD_H_ */