diff --git a/[refs] b/[refs] index 9808796f1b0a..2154bc39ea8e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b582d19ce9e14bf5bbc36688bf818b3c42574da +refs/heads/master: 09558748464a9afafe2848a3ad4cfd509c9b0fb6 diff --git a/trunk/arch/sh/Makefile b/trunk/arch/sh/Makefile index 01d85c74481d..0bc956012c38 100644 --- a/trunk/arch/sh/Makefile +++ b/trunk/arch/sh/Makefile @@ -76,8 +76,10 @@ KBUILD_IMAGE := $(defaultimage-y) # error messages during linking. # ifdef CONFIG_SUPERH32 +UTS_MACHINE := sh LDFLAGS_vmlinux += -e _stext else +UTS_MACHINE := sh64 LDFLAGS_vmlinux += --defsym phys_stext=_stext-$(CONFIG_PAGE_OFFSET) \ --defsym phys_stext_shmedia=phys_stext+1 \ -e phys_stext_shmedia