diff for duplicates of <20130530085240.24374.65991.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index d50d52d..2ac58dc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -39,7 +39,7 @@ Not-yet-Signed-off-by: Magnus Damm <damm@opensource.se> + asm volatile("mcr p15, 0, %0, c14, c0, 0" : : "r" (r8a73a4_arch_freq)); + + /* CNTVOFF has to be initialized either from non-secure Hypervisor -+ * mode or secure Monitor mode with SCR.NS=1. If TrustZone is enabled ++ * mode or secure Monitor mode with SCR.NS==1. If TrustZone is enabled + * then it should be handled by the secure code + */ + asm volatile( diff --git a/a/content_digest b/N1/content_digest index c36cb2d..340a0dc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020130530085152.24374.64208.sendpatchset@w520\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH 05/05] ARM: shmobile: r8a73a4 CA7 setup arch timer\0" - "Date\0Thu, 30 May 2013 08:52:40 +0000\0" + "Date\0Thu, 30 May 2013 17:52:40 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -46,7 +46,7 @@ "+\tasm volatile(\"mcr p15, 0, %0, c14, c0, 0\" : : \"r\" (r8a73a4_arch_freq));\n" "+\n" "+\t/* CNTVOFF has to be initialized either from non-secure Hypervisor\n" - "+\t * mode or secure Monitor mode with SCR.NS=1. If TrustZone is enabled\n" + "+\t * mode or secure Monitor mode with SCR.NS==1. If TrustZone is enabled\n" "+\t * then it should be handled by the secure code\n" "+\t */\n" "+\tasm volatile(\n" @@ -93,4 +93,4 @@ " \n" #ifdef CONFIG_HOTPLUG_CPU -b20f1f89c1b8d07382d5224662ba8f1fe2c3c4df638b750bf66333cbc5025d83 +75b25f937a2846564be104a329b56d7749fde26226e249c58a15178db846270c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.