diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-27 23:21:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-27 23:26:01 -0400 |
| commit | 82268da1b130f763d22d04f7d016bbf6fc8815c2 (patch) | |
| tree | 9803f361556d10708313e980428e63a18162e667 /arch/s390/kernel/compat_wrapper.S | |
| parent | 6e15cf04860074ad032e88c306bea656bbdd0f22 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'linus' into percpu-cpumask-x86-for-linus-2
Conflicts:
arch/sparc/kernel/time_64.c
drivers/gpu/drm/drm_proc.c
Manual merge to resolve build warning due to phys_addr_t type change
on x86:
drivers/gpu/drm/drm_info.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/s390/kernel/compat_wrapper.S')
| -rw-r--r-- | arch/s390/kernel/compat_wrapper.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S index 62c706eb0de..87cf5a79a35 100644 --- a/arch/s390/kernel/compat_wrapper.S +++ b/arch/s390/kernel/compat_wrapper.S | |||
| @@ -252,7 +252,7 @@ sys32_chroot_wrapper: | |||
| 252 | sys32_ustat_wrapper: | 252 | sys32_ustat_wrapper: |
| 253 | llgfr %r2,%r2 # dev_t | 253 | llgfr %r2,%r2 # dev_t |
| 254 | llgtr %r3,%r3 # struct ustat * | 254 | llgtr %r3,%r3 # struct ustat * |
| 255 | jg sys_ustat | 255 | jg compat_sys_ustat |
| 256 | 256 | ||
| 257 | .globl sys32_dup2_wrapper | 257 | .globl sys32_dup2_wrapper |
| 258 | sys32_dup2_wrapper: | 258 | sys32_dup2_wrapper: |