diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-20 16:32:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-20 16:32:19 -0700 |
| commit | a9523f45264aee8ec8d9f82091a0dfe1418fb2f8 (patch) | |
| tree | 43be11fc480090c1f3698c02302ea88ca1f4ea51 /arch/mips/Makefile | |
| parent | 9fe02c03b4e892acb3c33819ac4385d43b2f0bd7 (diff) | |
| parent | a5e696e5d0f1377ff6beb10d2f40edb6a3d1de18 (diff) | |
| download | kernel_samsung_smdk4412-a9523f45264aee8ec8d9f82091a0dfe1418fb2f8.zip kernel_samsung_smdk4412-a9523f45264aee8ec8d9f82091a0dfe1418fb2f8.tar.gz kernel_samsung_smdk4412-a9523f45264aee8ec8d9f82091a0dfe1418fb2f8.tar.bz2 | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: 64-bit: Fix system lockup.
MIPS: IP28: Change to build with -mr10k-cache-barrier=store
MIPS: IP22: Fix hang in power button interrupt handler
MIPS: IP32: Fix hang on shutdown in power button interrupt handler.
Diffstat (limited to 'arch/mips/Makefile')
| -rw-r--r-- | arch/mips/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 26947ab..c4cae9e 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -473,12 +473,12 @@ endif # Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys # ifdef CONFIG_SGI_IP28 - ifeq ($(call cc-option-yn,-mr10k-cache-barrier=1), n) - $(error gcc doesn't support needed option -mr10k-cache-barrier=1) + ifeq ($(call cc-option-yn,-mr10k-cache-barrier=store), n) + $(error gcc doesn't support needed option -mr10k-cache-barrier=store) endif endif core-$(CONFIG_SGI_IP28) += arch/mips/sgi-ip22/ -cflags-$(CONFIG_SGI_IP28) += -mr10k-cache-barrier=1 -I$(srctree)/arch/mips/include/asm/mach-ip28 +cflags-$(CONFIG_SGI_IP28) += -mr10k-cache-barrier=store -I$(srctree)/arch/mips/include/asm/mach-ip28 load-$(CONFIG_SGI_IP28) += 0xa800000020004000 # |