change function names

kernel/include/cls.h

@@ -16,7 +16,7 @@ struct malloc_header {
 #define CPU_STATUS_DISABLE	(0)
 #define CPU_STATUS_IDLE		(1)
 #define CPU_STATUS_RUNNING	(2)
-extern aal_spinlock_t	cpu_status_lock;
+extern ihk_spinlock_t	cpu_status_lock;
 
 struct cpu_local_var {
 	/* malloc */
@@ -25,12 +25,12 @@ struct cpu_local_var {
 	struct process idle;
 	struct process_vm idle_vm;
 
-	aal_spinlock_t runq_lock;
+	ihk_spinlock_t runq_lock;
 	struct process *current;
 	struct list_head runq;
 	size_t runq_len;
 
-	struct aal_ikc_channel_desc *syscall_channel;
+	struct ihk_ikc_channel_desc *syscall_channel;
 
 	struct syscall_params scp;
 	struct ikc_scd_init_param iip;
@@ -43,7 +43,7 @@ struct cpu_local_var {
 struct cpu_local_var *get_cpu_local_var(int id);
 static struct cpu_local_var *get_this_cpu_local_var(void)
 {
-	return get_cpu_local_var(aal_mc_get_processor_id());
+	return get_cpu_local_var(ihk_mc_get_processor_id());
 }
 
 #define cpu_local_var(name) get_this_cpu_local_var()->name

kernel/include/futex.h

@@ -211,13 +211,13 @@ static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
 struct futex {
 	struct list_head		link;
 	struct waitq			waitq;
-	aal_spinlock_t *		lock_ptr;
+	ihk_spinlock_t *		lock_ptr;
 	uint32_t __user *		uaddr;
 	uint32_t				bitset;
 };
 
 struct futex_queue {
-	aal_spinlock_t			lock;
+	ihk_spinlock_t			lock;
 	struct list_head		futex_list;
 };
 

kernel/include/init.h

@@ -11,7 +11,7 @@ extern void mc_ikc_test_init(void);
 extern void cpu_local_var_init(void);
 extern void kmalloc_init(void);
 extern void ap_start(void);
-extern void aal_mc_dma_init(void);
+extern void ihk_mc_dma_init(void);
 extern void init_host_syscall_channel(void);
 extern void sched_init(void);
 extern void pc_ap_init(void);

kernel/include/kmalloc.h

@@ -3,7 +3,7 @@
 
 #include <ihk/mm.h>
 
-void *kmalloc(int size, enum aal_mc_ap_flag flag);
+void *kmalloc(int size, enum ihk_mc_ap_flag flag);
 void kfree(void *ptr);
 
 #endif

kernel/include/lwk/compiler-gcc.h

@@ -7,7 +7,7 @@
 
 /* Optimization barrier */
 /* The "volatile" is due to gcc bugs
- * NOTE: already defined in aal/manycore/generic/include/aal/cpu.h 
+ * NOTE: already defined in ihk/manycore/generic/include/ihk/cpu.h 
  * #define barrier() __asm__ __volatile__("": : :"memory")
  */
 

kernel/include/page.h

@@ -1,7 +1,7 @@
 #ifndef __HEADER_PAGE_H
 #define __HEADER_PAGE_H
 
-void *allocate_pages(int npages, enum aal_mc_ap_flag flag);
+void *allocate_pages(int npages, enum ihk_mc_ap_flag flag);
 void free_pages(void *va, int npages);
 
 #endif

kernel/include/process.h

@@ -49,13 +49,13 @@ struct process {
 
 	struct process_vm *vm;
 
-	aal_mc_kernel_context_t ctx;
-	aal_mc_user_context_t  *uctx;
+	ihk_mc_kernel_context_t ctx;
+	ihk_mc_user_context_t  *uctx;
 	
 	// Runqueue list entry
 	struct list_head sched_list;  
 	
-	aal_spinlock_t spin_sleep_lock;
+	ihk_spinlock_t spin_sleep_lock;
 	int spin_sleep;
 
 	struct thread {
@@ -65,7 +65,7 @@ struct process {
 };
 
 struct process_vm {
-	aal_atomic_t refcount;
+	ihk_atomic_t refcount;
 
 	struct page_table *page_table;
 	struct list_head vm_range_list;
@@ -74,13 +74,13 @@ struct process_vm {
 	// Address space private futexes 
 	struct futex_queue futex_queues[1 << FUTEX_HASHBITS];
 
-    aal_spinlock_t page_table_lock;
-    aal_spinlock_t memory_range_lock;
+    ihk_spinlock_t page_table_lock;
+    ihk_spinlock_t memory_range_lock;
     // to protect the followings:
     // 1. addition of process "memory range" (extend_process_region, add_process_memory_range)
     // 2. addition of process page table (allocate_pages, update_process_page_table)
-    // note that physical memory allocator (aal_mc_alloc_pages, aal_pagealloc_alloc)
-    // is protected by its own lock (see aal/manycore/generic/page_alloc.c)
+    // note that physical memory allocator (ihk_mc_alloc_pages, ihk_pagealloc_alloc)
+    // is protected by its own lock (see ihk/manycore/generic/page_alloc.c)
 };
 
 

kernel/include/syscall.h

@@ -135,7 +135,7 @@ struct syscall_params {
 	unsigned long post_rpa, post_pa;
 	struct syscall_post *post_va;
 	unsigned long post_fin;
-	struct syscall_post post_buf AAL_DMA_ALIGN;
+	struct syscall_post post_buf IHK_DMA_ALIGN;
 };
 
 #endif

kernel/include/waitq.h

@@ -16,7 +16,7 @@ int default_wake_function(struct waitq_entry *wait, unsigned mode, int flags,
 			              void *key);
 
 typedef struct waitq {
-	aal_spinlock_t lock;
+	ihk_spinlock_t lock;
 	struct list_head waitq;
 } waitq_t;