gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change type of kprintf_lock() to "unsigned long"

Browse Source 
to match type of ihk_mc_spinlock_lock().
This commit is contained in:
NAKAMURA Gou
2015-02-18 18:17:14 +09:00
parent d35e60c1a3
commit 0e98e87b95
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/cpu.c
View File

@ -824,7 +824,7 @@ void arch_show_extended_context(void)
void arch_show_interrupt_context(const void *reg) void arch_show_interrupt_context(const void *reg)
{ {
const struct x86_regs *regs = reg; const struct x86_regs *regs = reg;
int irqflags; unsigned long irqflags;
irqflags = kprintf_lock(); irqflags = kprintf_lock();

4
kernel/debug.c
View File

@ -45,12 +45,12 @@ void kputs(char *buf)
#define KPRINTF_LOCAL_BUF_LEN 1024 #define KPRINTF_LOCAL_BUF_LEN 1024
int kprintf_lock() unsigned long kprintf_lock(void)
{ {
return ihk_mc_spinlock_lock(&kmsg_lock); return ihk_mc_spinlock_lock(&kmsg_lock);
} }
void kprintf_unlock(int irqflags) void kprintf_unlock(unsigned long irqflags)
{ {
ihk_mc_spinlock_unlock(&kmsg_lock, irqflags); ihk_mc_spinlock_unlock(&kmsg_lock, irqflags);
} }

2
kernel/mem.c
View File

@ -214,7 +214,7 @@ static void unhandled_page_fault(struct process *proc, void *fault_addr, void *r
struct process_vm *vm = proc->vm; struct process_vm *vm = proc->vm;
struct vm_range *range; struct vm_range *range;
char found; char found;
int irqflags; unsigned long irqflags;
unsigned long error = ((struct x86_regs *)regs)->error; unsigned long error = ((struct x86_regs *)regs)->error;
irqflags = kprintf_lock(); irqflags = kprintf_lock();

4
lib/include/ihk/debug.h
View File

@ -22,8 +22,8 @@ struct ihk_kmsg_buf {
}; };
extern int kprintf(const char *format, ...); extern int kprintf(const char *format, ...);
extern int kprintf_lock(); extern unsigned long kprintf_lock(void);
extern void kprintf_unlock(int irqflags); extern void kprintf_unlock(unsigned long irqflags);
extern int __kprintf(const char *format, ...); extern int __kprintf(const char *format, ...);
extern void panic(const char *msg); extern void panic(const char *msg);