tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'parisc-3.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc fixes from Helge Deller:
"The major patch in here is one which fixes the fanotify_mark() syscall
in the compat layer of the 64bit parisc kernel. It went unnoticed so
long, because the calling syntax when using a 64bit parameter in a
32bit syscall is quite complex and even worse, it may be even
different if you call syscall() or the glibc wrapper. This patch
makes the kernel accept the calling convention when called by the
glibc wrapper.

The other two patches are trivial and remove unused headers, #includes
and adds the serial ports of the fastest C8000 workstation to the
parisc-kernel internal hardware database"

* 'parisc-3.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: drop unused defines and header includes
parisc: fix fanotify_mark() syscall on 32bit compat kernel
parisc: add serial ports of C8000/1GHz machine to hardware database

Linus Torvalds 54f8c2aa 28b1fae5

+13 -38
+2 -1
arch/parisc/kernel/hardware.c
··· 1210 1210 {HPHW_FIO, 0x004, 0x00320, 0x0, "Metheus Frame Buffer"}, 1211 1211 {HPHW_FIO, 0x004, 0x00340, 0x0, "BARCO CX4500 VME Grphx Cnsl"}, 1212 1212 {HPHW_FIO, 0x004, 0x00360, 0x0, "Hughes TOG VME FDDI"}, 1213 - {HPHW_FIO, 0x076, 0x000AD, 0x00, "Crestone Peak RS-232"}, 1213 + {HPHW_FIO, 0x076, 0x000AD, 0x0, "Crestone Peak Core RS-232"}, 1214 + {HPHW_FIO, 0x077, 0x000AD, 0x0, "Crestone Peak Fast? Core RS-232"}, 1214 1215 {HPHW_IOA, 0x185, 0x0000B, 0x00, "Java BC Summit Port"}, 1215 1216 {HPHW_IOA, 0x1FF, 0x0000B, 0x00, "Hitachi Ghostview Summit Port"}, 1216 1217 {HPHW_IOA, 0x580, 0x0000B, 0x10, "U2-IOA BC Runway Port"},
+10 -36
arch/parisc/kernel/sys_parisc32.c
··· 4 4 * Copyright (C) 2000-2001 Hewlett Packard Company 5 5 * Copyright (C) 2000 John Marvin 6 6 * Copyright (C) 2001 Matthew Wilcox 7 + * Copyright (C) 2014 Helge Deller <deller@gmx.de> 7 8 * 8 9 * These routines maintain argument size conversion between 32bit and 64bit 9 10 * environment. Based heavily on sys_ia32.c and sys_sparc32.c. ··· 12 11 13 12 #include <linux/compat.h> 14 13 #include <linux/kernel.h> 15 - #include <linux/sched.h> 16 - #include <linux/fs.h> 17 - #include <linux/mm.h> 18 - #include <linux/file.h> 19 - #include <linux/signal.h> 20 - #include <linux/resource.h> 21 - #include <linux/times.h> 22 - #include <linux/time.h> 23 - #include <linux/smp.h> 24 - #include <linux/sem.h> 25 - #include <linux/shm.h> 26 - #include <linux/slab.h> 27 - #include <linux/uio.h> 28 - #include <linux/ncp_fs.h> 29 - #include <linux/poll.h> 30 - #include <linux/personality.h> 31 - #include <linux/stat.h> 32 - #include <linux/highmem.h> 33 - #include <linux/highuid.h> 34 - #include <linux/mman.h> 35 - #include <linux/binfmts.h> 36 - #include <linux/namei.h> 37 - #include <linux/vfs.h> 38 - #include <linux/ptrace.h> 39 - #include <linux/swap.h> 40 14 #include <linux/syscalls.h> 41 15 42 - #include <asm/types.h> 43 - #include <asm/uaccess.h> 44 - #include <asm/mmu_context.h> 45 - 46 - #undef DEBUG 47 - 48 - #ifdef DEBUG 49 - #define DBG(x) printk x 50 - #else 51 - #define DBG(x) 52 - #endif 53 16 54 17 asmlinkage long sys32_unimplemented(int r26, int r25, int r24, int r23, 55 18 int r22, int r21, int r20) ··· 21 56 printk(KERN_ERR "%s(%d): Unimplemented 32 on 64 syscall #%d!\n", 22 57 current->comm, current->pid, r20); 23 58 return -ENOSYS; 59 + } 60 + 61 + asmlinkage long sys32_fanotify_mark(compat_int_t fanotify_fd, compat_uint_t flags, 62 + compat_uint_t mask0, compat_uint_t mask1, compat_int_t dfd, 63 + const char __user * pathname) 64 + { 65 + return sys_fanotify_mark(fanotify_fd, flags, 66 + ((__u64)mask1 << 32) | mask0, 67 + dfd, pathname); 24 68 }
+1 -1
arch/parisc/kernel/syscall_table.S
··· 418 418 ENTRY_SAME(accept4) /* 320 */ 419 419 ENTRY_SAME(prlimit64) 420 420 ENTRY_SAME(fanotify_init) 421 - ENTRY_COMP(fanotify_mark) 421 + ENTRY_DIFF(fanotify_mark) 422 422 ENTRY_COMP(clock_adjtime) 423 423 ENTRY_SAME(name_to_handle_at) /* 325 */ 424 424 ENTRY_COMP(open_by_handle_at)