projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86/paravirt: revert exports to restore old behaviour
[linux-block.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index cb740d4d4e8cb89f67d7a542fbe804e6afe1b604..a65ffd27de6b5f6786f2d17cc716f003efa628b9 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 24
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 24
-EXTRAVERSION = -rc
1
+EXTRAVERSION = -rc
3
NAME = Arr Matey! A Hairy Bilge Rat!
# *DOCUMENTATION*
NAME = Arr Matey! A Hairy Bilge Rat!
# *DOCUMENTATION*
@@
-197,8
+197,13
@@
CROSS_COMPILE ?=
UTS_MACHINE := $(ARCH)
SRCARCH := $(ARCH)
UTS_MACHINE := $(ARCH)
SRCARCH := $(ARCH)
-# for i386 and x86_64 we use SRCARCH equal to x86
-SRCARCH := $(if $(filter x86_64 i386,$(SRCARCH)),x86,$(SRCARCH))
+# Additional ARCH settings for x86
+ifeq ($(ARCH),i386)
+ SRCARCH := x86
+endif
+ifeq ($(ARCH),x86_64)
+ SRCARCH := x86
+endif
KCONFIG_CONFIG ?= .config
KCONFIG_CONFIG ?= .config
@@
-1327,12
+1332,7
@@
else
ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS)
endif
ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS)
endif
-# Take care of arch/x86
-ifeq ($(ARCH), $(SRCARCH))
-ALLSOURCE_ARCHS := $(ARCH)
-else
-ALLSOURCE_ARCHS := $(ARCH) $(SRCARCH)
-endif
+ALLSOURCE_ARCHS := $(SRCARCH)
define find-sources
( for arch in $(ALLSOURCE_ARCHS) ; do \
define find-sources
( for arch in $(ALLSOURCE_ARCHS) ; do \