Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin:
"Two quite small fixes: one a build problem, and the other fixes
seccomp filters on x32."
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Fix rebuild with EFI_STUB enabled
x86: remove the x32 syscall bitmask from syscall_get_nr()
+4
-5
+2
-3
arch/x86/boot/compressed/Makefile
+2
-3
arch/x86/boot/compressed/Makefile
···
4
4
# create a compressed vmlinux image from the original vmlinux
5
5
#
6
6
7
-
targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.xz vmlinux.bin.lzo head_$(BITS).o misc.o string.o cmdline.o early_serial_console.o piggy.o
7
+
targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.xz vmlinux.bin.lzo
8
8
9
9
KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2
10
10
KBUILD_CFLAGS += -fno-strict-aliasing -fPIC
···
29
29
$(obj)/piggy.o
30
30
31
31
$(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
32
-
$(obj)/efi_stub_$(BITS).o: KBUILD_CLFAGS += -fshort-wchar -mno-red-zone
33
32
34
33
ifeq ($(CONFIG_EFI_STUB), y)
35
34
VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o
···
42
43
$(obj)/vmlinux.bin: vmlinux FORCE
43
44
$(call if_changed,objcopy)
44
45
45
-
targets += vmlinux.bin.all vmlinux.relocs
46
+
targets += $(patsubst $(obj)/%,%,$(VMLINUX_OBJS)) vmlinux.bin.all vmlinux.relocs
46
47
47
48
CMD_RELOCS = arch/x86/tools/relocs
48
49
quiet_cmd_relocs = RELOCS $@
+2
-2
arch/x86/include/asm/syscall.h
+2
-2
arch/x86/include/asm/syscall.h
···
29
29
*/
30
30
static inline int syscall_get_nr(struct task_struct *task, struct pt_regs *regs)
31
31
{
32
-
return regs->orig_ax & __SYSCALL_MASK;
32
+
return regs->orig_ax;
33
33
}
34
34
35
35
static inline void syscall_rollback(struct task_struct *task,
36
36
struct pt_regs *regs)
37
37
{
38
-
regs->ax = regs->orig_ax & __SYSCALL_MASK;
38
+
regs->ax = regs->orig_ax;
39
39
}
40
40
41
41
static inline long syscall_get_error(struct task_struct *task,