]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
ARM64: fix build issue when supporting 64K pages
authorSri Krishna chowdary <schowdary@nvidia.com>
Mon, 27 Oct 2014 10:08:20 +0000 (15:38 +0530)
committerSri Krishna Chowdary <schowdary@nvidia.com>
Mon, 3 Nov 2014 06:18:44 +0000 (22:18 -0800)
CONFIG_COMPAT is disabled when CONFI_ARM64_64K_PAGES is enabled.
Hence, the following compilation error

arch/arm64/kernel/built-in.o: In function `el0_sync':
.../arch/arm64/kernel/entry.S:358: undefined reference to `el0_sync_tramp'

Fix it by removing CONFIG_COMPAT protection for el0_sync_tramp and
ret_from_exception so that the branch prediction optimization
stays for both 4K and 64K pages.

Bug 1526131

Change-Id: I1531809df536d6d93b6732b9dc1c28893eb1200e
Signed-off-by: Sri Krishna chowdary <schowdary@nvidia.com>
Reviewed-on: http://git-master/r/454023
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
arch/arm64/kernel/entry.S

index 25e02d8cef838d128d10c39bfc4b07a21863b9ff..653be463285440c6cc143535a0d4b49364a9705f 100644 (file)
@@ -424,6 +424,8 @@ el0_sync_compat:
        cmp     x24, #ESR_EL1_EC_BREAKPT_EL0    // debug exception in EL0
        b.ge    el0_sync_tramp
        b       el0_inv
+#endif
+
 el0_sync_tramp:
        blr     x26
        /* Fall through */
@@ -435,6 +437,7 @@ ret_from_exception:
        b       ret_to_user
 ENDPROC(ret_from_exception)
 
+#ifdef CONFIG_COMPAT
 el0_svc_compat:
        /*
         * AArch32 syscall handling