diff options
| author | James Morris <james.morris@microsoft.com> | 2019-01-23 01:33:10 +0300 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-01-23 01:33:10 +0300 |
| commit | 9624d5c9c7ff6836bbf9f9b230fd1fcf3d56f91a (patch) | |
| tree | e9c1e5d2400ad20c5a9cd633b52a42a00d1d98cb /arch/ia64/Makefile | |
| parent | 3e8c73671244af16f1a6042f1c10d13b75cd1156 (diff) | |
| parent | 49a57857aeea06ca831043acbb0fa5e0f50602fd (diff) | |
| download | linux-9624d5c9c7ff6836bbf9f9b230fd1fcf3d56f91a.tar.xz | |
Merge tag 'v5.0-rc3' into next-general
Sync to Linux 5.0-rc3 to pull in the VFS changes which impacted a lot
of the LSM code.
Diffstat (limited to 'arch/ia64/Makefile')
| -rw-r--r-- | arch/ia64/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 320d86f192ee..171290f9f1de 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile @@ -16,8 +16,6 @@ KBUILD_DEFCONFIG := generic_defconfig NM := $(CROSS_COMPILE)nm -B READELF := $(CROSS_COMPILE)readelf -export AWK - CHECKFLAGS += -D__ia64=1 -D__ia64__=1 -D_LP64 -D__LP64__ OBJCOPYFLAGS := --strip-all |