set_page_color syscall

5 files changed, 9 insertions, 2 deletions

diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 0db825dda11f..f31a912e2c9a 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -15,7 +15,7 @@
 
 #include <uapi/asm/unistd.h>
 /** __NR_syscalls padding */
-#define __NR_syscalls  (380 + NR_litmus_syscalls + 1)
+#define __NR_syscalls  (380 + NR_litmus_syscalls)
 
 #define __ARM_NR_cmpxchg                (__ARM_NR_BASE+0x00fff0)
 
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index 34c5ee7964eb..2fbce68d96d3 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -404,7 +404,8 @@
                 CALL(sys_reservation_create)
                 CALL(sys_reservation_destroy)
                 CALL(sys_set_mc2_task_param)
-
+/* 395 */       CALL(sys_set_page_color)
+                
 #ifndef syscalls_counted
 .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
 #define syscalls_counted
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index 5efe6b6e9d53..cff808e79199 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -326,6 +326,7 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask)
 {
         u32 aux;
         u32 cache_id;
+        u32 cache_type;
         u32 way_size = 0;
         int ways;
         int way_size_shift = L2X0_WAY_SIZE_SHIFT;
@@ -337,6 +338,8 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask)
         else
                 cache_id = readl_relaxed(l2x0_base + L2X0_CACHE_ID);
         aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL);
+        
+        cache_type = readl_relaxed(l2x0_base + L2X0_CACHE_TYPE);
 
         aux &= aux_mask;
         aux |= aux_val;
@@ -424,6 +427,7 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask)
         printk(KERN_INFO "%s cache controller enabled\n", type);
         printk(KERN_INFO "l2x0: %d ways, CACHE_ID 0x%08x, AUX_CTRL 0x%08x, Cache size: %d B\n",
                         ways, cache_id, aux, l2x0_size);
+        printk(KERN_INFO "l2x0: CACHE_TYPE 0x%08x\n", cache_type);
 
         litmus_setup_lockdown(l2x0_base, cache_id);
 }
diff --git a/arch/x86/syscalls/syscall_32.tbl b/arch/x86/syscalls/syscall_32.tbl
index 20f6cdcf56dd..401f313f9cdd 100644
--- a/arch/x86/syscalls/syscall_32.tbl
+++ b/arch/x86/syscalls/syscall_32.tbl
@@ -373,3 +373,4 @@
 363     i386    reservation_create      sys_reservation_create
 364     i386    reservation_destroy     sys_reservation_destroy
 365     i386    set_mc2_task_param      sys_set_mc2_task_param
+366     i386    set_page_color          sys_set_page_color
diff --git a/arch/x86/syscalls/syscall_64.tbl b/arch/x86/syscalls/syscall_64.tbl
index f3d142c2a900..77710a93c2a3 100644
--- a/arch/x86/syscalls/syscall_64.tbl
+++ b/arch/x86/syscalls/syscall_64.tbl
@@ -336,6 +336,7 @@
 363     common  reservation_create      sys_reservation_create
 364     common  reservation_destroy     sys_reservation_destroy
 365     common  set_mc2_task_param      sys_set_mc2_task_param
+366     common  set_page_color          sys_set_page_color
 
 #
 # x32-specific system call numbers start at 512 to avoid cache impact