From e9da356f64b0558cabd4920bca915d38d9ebaa9b Mon Sep 17 00:00:00 2001 From: Mark Rutland Date: Fri, 24 May 2013 12:02:35 +0100 Subject: [PATCH] --- yaml --- r: 376463 b: refs/heads/master c: 381cc2b9705512ee7c7f1839cbdde374625a2a9f h: refs/heads/master i: 376461: 8b3216491b53bdeaf294ad5a019601d22a976a21 376459: f69dcdddacb244e9e434ed7a1f0e92da34d99c90 376455: e727b78f7c6f0df7d292b9f92ad75b7e6579a37c 376447: 8407caa030f392144efd434e9af9a6ab8b79aa56 v: v3 --- [refs] | 2 +- trunk/arch/arm64/kernel/entry.S | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 65b48d4cec25..70d0264b73d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 953dbbed9ee310100bc841cdea8f992d192531c6 +refs/heads/master: 381cc2b9705512ee7c7f1839cbdde374625a2a9f diff --git a/trunk/arch/arm64/kernel/entry.S b/trunk/arch/arm64/kernel/entry.S index c7e047049f2c..1d1314280a03 100644 --- a/trunk/arch/arm64/kernel/entry.S +++ b/trunk/arch/arm64/kernel/entry.S @@ -390,6 +390,16 @@ el0_sync_compat: b.eq el0_fpsimd_exc cmp x24, #ESR_EL1_EC_UNKNOWN // unknown exception in EL0 b.eq el0_undef + cmp x24, #ESR_EL1_EC_CP15_32 // CP15 MRC/MCR trap + b.eq el0_undef + cmp x24, #ESR_EL1_EC_CP15_64 // CP15 MRRC/MCRR trap + b.eq el0_undef + cmp x24, #ESR_EL1_EC_CP14_MR // CP14 MRC/MCR trap + b.eq el0_undef + cmp x24, #ESR_EL1_EC_CP14_LS // CP14 LDC/STC trap + b.eq el0_undef + cmp x24, #ESR_EL1_EC_CP14_64 // CP14 MRRC/MCRR trap + b.eq el0_undef cmp x24, #ESR_EL1_EC_BREAKPT_EL0 // debug exception in EL0 b.ge el0_dbg b el0_inv