diff options
author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-04 19:33:56 +0700 |
---|---|---|
committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-03-04 19:33:56 +0700 |
commit | cdf733ed16cf85e9d89ed45f0eceb060f77955fd (patch) | |
tree | d6a234e722ad2d4c25b7c8bc3640b731525d8498 /include | |
parent | 1736943179733a4629e0eaa773848bdeeaeefec1 (diff) | |
parent | e28c3f2b514b5581e15614f7cf976131092cf4b6 (diff) | |
download | kernel_samsung_aries-cdf733ed16cf85e9d89ed45f0eceb060f77955fd.zip kernel_samsung_aries-cdf733ed16cf85e9d89ed45f0eceb060f77955fd.tar.gz kernel_samsung_aries-cdf733ed16cf85e9d89ed45f0eceb060f77955fd.tar.bz2 |
Merge 3.0.68
Conflicts:
kernel/cgroup.c
Change-Id: Ibae53bbb0eafbf4d273fce805eddce3db9ca48f9
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/auto_fs.h | 25 | ||||
-rw-r--r-- | include/linux/quota.h | 1 | ||||
-rw-r--r-- | include/linux/sched.h | 11 |
3 files changed, 19 insertions, 18 deletions
diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h index da64e15..6cdabb4 100644 --- a/include/linux/auto_fs.h +++ b/include/linux/auto_fs.h @@ -31,25 +31,16 @@ #define AUTOFS_MIN_PROTO_VERSION AUTOFS_PROTO_VERSION /* - * Architectures where both 32- and 64-bit binaries can be executed - * on 64-bit kernels need this. This keeps the structure format - * uniform, and makes sure the wait_queue_token isn't too big to be - * passed back down to the kernel. - * - * This assumes that on these architectures: - * mode 32 bit 64 bit - * ------------------------- - * int 32 bit 32 bit - * long 32 bit 64 bit - * - * If so, 32-bit user-space code should be backwards compatible. + * The wait_queue_token (autofs_wqt_t) is part of a structure which is passed + * back to the kernel via ioctl from userspace. On architectures where 32- and + * 64-bit userspace binaries can be executed it's important that the size of + * autofs_wqt_t stays constant between 32- and 64-bit Linux kernels so that we + * do not break the binary ABI interface by changing the structure size. */ - -#if defined(__sparc__) || defined(__mips__) || defined(__x86_64__) \ - || defined(__powerpc__) || defined(__s390__) -typedef unsigned int autofs_wqt_t; -#else +#if defined(__ia64__) || defined(__alpha__) /* pure 64bit architectures */ typedef unsigned long autofs_wqt_t; +#else +typedef unsigned int autofs_wqt_t; #endif /* Packet types */ diff --git a/include/linux/quota.h b/include/linux/quota.h index 9a85412..a6dd995 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h @@ -413,6 +413,7 @@ struct quota_module_name { #define INIT_QUOTA_MODULE_NAMES {\ {QFMT_VFS_OLD, "quota_v1"},\ {QFMT_VFS_V0, "quota_v2"},\ + {QFMT_VFS_V1, "quota_v2"},\ {0, NULL}} #else diff --git a/include/linux/sched.h b/include/linux/sched.h index 5039e0a..b5fb60f 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -2567,7 +2567,16 @@ static inline void thread_group_cputime_init(struct signal_struct *sig) extern void recalc_sigpending_and_wake(struct task_struct *t); extern void recalc_sigpending(void); -extern void signal_wake_up(struct task_struct *t, int resume_stopped); +extern void signal_wake_up_state(struct task_struct *t, unsigned int state); + +static inline void signal_wake_up(struct task_struct *t, bool resume) +{ + signal_wake_up_state(t, resume ? TASK_WAKEKILL : 0); +} +static inline void ptrace_signal_wake_up(struct task_struct *t, bool resume) +{ + signal_wake_up_state(t, resume ? __TASK_TRACED : 0); +} /* * Wrappers for p->thread_info->cpu access. No-op on UP. |