* [tip:x86/process 7/11] arch/x86/um/syscalls_64.c:15:6: error: conflicting types for 'arch_prctl'
@ 2017-03-20 17:27 kbuild test robot
2017-03-20 23:05 ` [PATCH] um: fix build error due to typo Kyle Huey
0 siblings, 1 reply; 3+ messages in thread
From: kbuild test robot @ 2017-03-20 17:27 UTC (permalink / raw)
To: Kyle Huey
Cc: kbuild-all, linux-kernel, tipbuild, Thomas Gleixner, Andy Lutomirski
[-- Attachment #1: Type: text/plain, Size: 8010 bytes --]
tree: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/process
head: e9ea1e7f53b852147cbd568b0568c7ad97ec21a3
commit: 17a6e1b8e8e8539f89156643f8c3073f09ec446a [7/11] x86/arch_prctl/64: Rename do_arch_prctl() to do_arch_prctl_64()
config: um-x86_64_defconfig (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
git checkout 17a6e1b8e8e8539f89156643f8c3073f09ec446a
# save the attached .config to linux build tree
make ARCH=um SUBARCH=x86_64
All error/warnings (new ones prefixed by >>):
>> arch/x86/um/syscalls_64.c:15:6: error: conflicting types for 'arch_prctl'
long arch_prctl(struct task_struct *task, int option)
^~~~~~~~~~
In file included from arch/um/include/asm/processor-generic.h:13:0,
from arch/x86/um/asm/processor.h:32,
from include/linux/spinlock_up.h:8,
from include/linux/spinlock.h:89,
from include/linux/rcupdate.h:38,
from include/linux/rculist.h:10,
from include/linux/pid.h:4,
from include/linux/sched.h:13,
from arch/x86/um/syscalls_64.c:8:
arch/x86/um/asm/ptrace.h:81:13: note: previous declaration of 'arch_prctl' was here
extern long arch_prctl(struct task_struct *task, int option,
^~~~~~~~~~
arch/x86/um/syscalls_64.c: In function 'arch_prctl':
>> arch/x86/um/syscalls_64.c:16:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before ')' token
unsigned long __user *arg2)
^
>> arch/x86/um/syscalls_64.c:78:1: warning: 'alias' attribute ignored [-Wattributes]
SYSCALL_DEFINE2(arch_prctl, int, option, unsigned long, arg2)
^~~~~~~~~~~~~~~
In file included from arch/x86/um/syscalls_64.c:10:0:
>> include/linux/syscalls.h:198:21: error: storage class specified for parameter 'SYSC_arch_prctl'
static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
^
>> include/linux/syscalls.h:192:2: note: in expansion of macro '__SYSCALL_DEFINEx'
__SYSCALL_DEFINEx(x, sname, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
>> include/linux/syscalls.h:184:36: note: in expansion of macro 'SYSCALL_DEFINEx'
#define SYSCALL_DEFINE2(name, ...) SYSCALL_DEFINEx(2, _##name, __VA_ARGS__)
^~~~~~~~~~~~~~~
>> arch/x86/um/syscalls_64.c:78:1: note: in expansion of macro 'SYSCALL_DEFINE2'
SYSCALL_DEFINE2(arch_prctl, int, option, unsigned long, arg2)
^~~~~~~~~~~~~~~
>> include/linux/syscalls.h:198:21: warning: parameter 'SYSC_arch_prctl' declared 'inline'
static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
^
>> include/linux/syscalls.h:192:2: note: in expansion of macro '__SYSCALL_DEFINEx'
__SYSCALL_DEFINEx(x, sname, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
>> include/linux/syscalls.h:184:36: note: in expansion of macro 'SYSCALL_DEFINEx'
#define SYSCALL_DEFINE2(name, ...) SYSCALL_DEFINEx(2, _##name, __VA_ARGS__)
^~~~~~~~~~~~~~~
>> arch/x86/um/syscalls_64.c:78:1: note: in expansion of macro 'SYSCALL_DEFINE2'
SYSCALL_DEFINE2(arch_prctl, int, option, unsigned long, arg2)
^~~~~~~~~~~~~~~
>> arch/x86/um/syscalls_64.c:78:1: warning: 'always_inline' attribute ignored [-Wattributes]
In file included from arch/x86/um/syscalls_64.c:10:0:
>> include/linux/syscalls.h:198:21: error: 'no_instrument_function' attribute applies only to functions
static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
^
>> include/linux/syscalls.h:192:2: note: in expansion of macro '__SYSCALL_DEFINEx'
__SYSCALL_DEFINEx(x, sname, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
>> include/linux/syscalls.h:184:36: note: in expansion of macro 'SYSCALL_DEFINEx'
#define SYSCALL_DEFINE2(name, ...) SYSCALL_DEFINEx(2, _##name, __VA_ARGS__)
^~~~~~~~~~~~~~~
>> arch/x86/um/syscalls_64.c:78:1: note: in expansion of macro 'SYSCALL_DEFINE2'
SYSCALL_DEFINE2(arch_prctl, int, option, unsigned long, arg2)
^~~~~~~~~~~~~~~
>> include/linux/syscalls.h:201:2: error: expected '=', ',', ';', 'asm' or '__attribute__' before '{' token
{ \
^
>> include/linux/syscalls.h:192:2: note: in expansion of macro '__SYSCALL_DEFINEx'
__SYSCALL_DEFINEx(x, sname, __VA_ARGS__)
^~~~~~~~~~~~~~~~~
>> include/linux/syscalls.h:184:36: note: in expansion of macro 'SYSCALL_DEFINEx'
#define SYSCALL_DEFINE2(name, ...) SYSCALL_DEFINEx(2, _##name, __VA_ARGS__)
^~~~~~~~~~~~~~~
>> arch/x86/um/syscalls_64.c:78:1: note: in expansion of macro 'SYSCALL_DEFINE2'
SYSCALL_DEFINE2(arch_prctl, int, option, unsigned long, arg2)
^~~~~~~~~~~~~~~
vim +/arch_prctl +15 arch/x86/um/syscalls_64.c
2 * Copyright (C) 2003 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
3 * Copyright 2003 PathScale, Inc.
4 *
5 * Licensed under the GPL
6 */
7
> 8 #include <linux/sched.h>
9 #include <linux/sched/mm.h>
10 #include <linux/syscalls.h>
11 #include <linux/uaccess.h>
12 #include <asm/prctl.h> /* XXX This should get the constants from libc */
13 #include <os.h>
14
> 15 long arch_prctl(struct task_struct *task, int option)
> 16 unsigned long __user *arg2)
17 {
18 unsigned long *ptr = arg2, tmp;
19 long ret;
20 int pid = task->mm->context.id.u.pid;
21
22 /*
23 * With ARCH_SET_FS (and ARCH_SET_GS is treated similarly to
24 * be safe), we need to call arch_prctl on the host because
25 * setting %fs may result in something else happening (like a
26 * GDT or thread.fs being set instead). So, we let the host
27 * fiddle the registers and thread struct and restore the
28 * registers afterwards.
29 *
30 * So, the saved registers are stored to the process (this
31 * needed because a stub may have been the last thing to run),
32 * arch_prctl is run on the host, then the registers are read
33 * back.
34 */
35 switch (option) {
36 case ARCH_SET_FS:
37 case ARCH_SET_GS:
38 ret = restore_registers(pid, ¤t->thread.regs.regs);
39 if (ret)
40 return ret;
41 break;
42 case ARCH_GET_FS:
43 case ARCH_GET_GS:
44 /*
45 * With these two, we read to a local pointer and
46 * put_user it to the userspace pointer that we were
47 * given. If addr isn't valid (because it hasn't been
48 * faulted in or is just bogus), we want put_user to
49 * fault it in (or return -EFAULT) instead of having
50 * the host return -EFAULT.
51 */
52 ptr = &tmp;
53 }
54
55 ret = os_arch_prctl(pid, option, ptr);
56 if (ret)
57 return ret;
58
59 switch (option) {
60 case ARCH_SET_FS:
61 current->thread.arch.fs = (unsigned long) ptr;
62 ret = save_registers(pid, ¤t->thread.regs.regs);
63 break;
64 case ARCH_SET_GS:
65 ret = save_registers(pid, ¤t->thread.regs.regs);
66 break;
67 case ARCH_GET_FS:
68 ret = put_user(tmp, arg2);
69 break;
70 case ARCH_GET_GS:
71 ret = put_user(tmp, arg2);
72 break;
73 }
74
75 return ret;
76 }
77
> 78 SYSCALL_DEFINE2(arch_prctl, int, option, unsigned long, arg2)
> 79 {
80 return arch_prctl(current, option, (unsigned long __user *) arg2);
81 }
82
83 void arch_switch_to(struct task_struct *to)
> 84 {
85 if ((to->thread.arch.fs == 0) || (to->mm == NULL))
86 return;
87
88 arch_prctl(to, ARCH_SET_FS, (void __user *) to->thread.arch.fs);
> 89 }
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 7698 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] um: fix build error due to typo
2017-03-20 17:27 [tip:x86/process 7/11] arch/x86/um/syscalls_64.c:15:6: error: conflicting types for 'arch_prctl' kbuild test robot
@ 2017-03-20 23:05 ` Kyle Huey
2017-03-21 9:13 ` [tip:x86/process] um/arch_prctl: Fix fallout from x86 arch_prctl() rework tip-bot for Kyle Huey
0 siblings, 1 reply; 3+ messages in thread
From: Kyle Huey @ 2017-03-20 23:05 UTC (permalink / raw)
To: Thomas Gleixner; +Cc: Andy Lutomirski, linux-kernel, tipbuild, kbuild-all
Oops.
Signed-off-by: Kyle Huey <khuey@kylehuey.com>
---
arch/x86/um/syscalls_64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/um/syscalls_64.c b/arch/x86/um/syscalls_64.c
index 81b9fe100f7c..58f51667e2e4 100644
--- a/arch/x86/um/syscalls_64.c
+++ b/arch/x86/um/syscalls_64.c
@@ -12,7 +12,7 @@
#include <asm/prctl.h> /* XXX This should get the constants from libc */
#include <os.h>
-long arch_prctl(struct task_struct *task, int option)
+long arch_prctl(struct task_struct *task, int option,
unsigned long __user *arg2)
{
unsigned long *ptr = arg2, tmp;
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [tip:x86/process] um/arch_prctl: Fix fallout from x86 arch_prctl() rework
2017-03-20 23:05 ` [PATCH] um: fix build error due to typo Kyle Huey
@ 2017-03-21 9:13 ` tip-bot for Kyle Huey
0 siblings, 0 replies; 3+ messages in thread
From: tip-bot for Kyle Huey @ 2017-03-21 9:13 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, me, hpa, luto, khuey, tglx, mingo
Commit-ID: d582799fe5de1c1ca127d7f364db12a660cf46d4
Gitweb: http://git.kernel.org/tip/d582799fe5de1c1ca127d7f364db12a660cf46d4
Author: Kyle Huey <me@kylehuey.com>
AuthorDate: Mon, 20 Mar 2017 16:05:35 -0700
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 21 Mar 2017 10:08:29 +0100
um/arch_prctl: Fix fallout from x86 arch_prctl() rework
The recent arch_prctl rework added a bracket instead of a comma. Fix it.
Fixes: 17a6e1b8e8e8 ("x86/arch_prctl/64: Rename do_arch_prctl() to do_arch_prctl_64()")
Signed-off-by: Kyle Huey <khuey@kylehuey.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: kbuild-all@01.org
Link: http://lkml.kernel.org/r/20170320230535.11281-1-khuey@kylehuey.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/um/syscalls_64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/um/syscalls_64.c b/arch/x86/um/syscalls_64.c
index 81b9fe1..58f5166 100644
--- a/arch/x86/um/syscalls_64.c
+++ b/arch/x86/um/syscalls_64.c
@@ -12,7 +12,7 @@
#include <asm/prctl.h> /* XXX This should get the constants from libc */
#include <os.h>
-long arch_prctl(struct task_struct *task, int option)
+long arch_prctl(struct task_struct *task, int option,
unsigned long __user *arg2)
{
unsigned long *ptr = arg2, tmp;
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-21 9:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-20 17:27 [tip:x86/process 7/11] arch/x86/um/syscalls_64.c:15:6: error: conflicting types for 'arch_prctl' kbuild test robot
2017-03-20 23:05 ` [PATCH] um: fix build error due to typo Kyle Huey
2017-03-21 9:13 ` [tip:x86/process] um/arch_prctl: Fix fallout from x86 arch_prctl() rework tip-bot for Kyle Huey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).