diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2010-10-05 17:35:47 -0500 |
|---|---|---|
| committer | Patrick Williams <iawillia@us.ibm.com> | 2010-10-05 17:35:47 -0500 |
| commit | 5d43599264f23482f84fbd82958ce60fac43c4b4 (patch) | |
| tree | 260897d9c054fa18196d92137dd6ae16c4d17720 /src/kernel | |
| parent | 86ac0669c13dddb64cc50a036544d4f67dc5dcd8 (diff) | |
| download | talos-hostboot-5d43599264f23482f84fbd82958ce60fac43c4b4.tar.gz talos-hostboot-5d43599264f23482f84fbd82958ce60fac43c4b4.zip | |
Support printk format warnings.
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/console.C | 10 | ||||
| -rw-r--r-- | src/kernel/exception.C | 4 | ||||
| -rw-r--r-- | src/kernel/pagemgr.C | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/kernel/console.C b/src/kernel/console.C index 032d74213..6cc2d1dac 100644 --- a/src/kernel/console.C +++ b/src/kernel/console.C @@ -180,12 +180,12 @@ void printk(const char* str, ...) break; case 2: - case 3: ConsoleDisplay<int, ConsoleTraits::DEC> ::display(console, va_arg(args,int)); break; + case 3: case 4: ConsoleDisplay<long, ConsoleTraits::DEC> ::display(console, @@ -214,12 +214,12 @@ void printk(const char* str, ...) break; case 2: - case 3: ConsoleDisplay<unsigned int, ConsoleTraits::DEC> ::display(console, va_arg(args,unsigned int)); break; - + + case 3: case 4: ConsoleDisplay<unsigned long, ConsoleTraits::DEC> ::display(console, @@ -249,12 +249,12 @@ void printk(const char* str, ...) break; case 2: - case 3: ConsoleDisplay<unsigned int, ConsoleTraits::HEX> ::display(console, va_arg(args,unsigned int)); break; - + + case 3: case 4: ConsoleDisplay<unsigned long, ConsoleTraits::HEX> ::display(console, diff --git a/src/kernel/exception.C b/src/kernel/exception.C index 040284d72..568d80842 100644 --- a/src/kernel/exception.C +++ b/src/kernel/exception.C @@ -52,7 +52,7 @@ void kernel_execute_data_storage() } if (!handled) { - printk("Data Storage exception on %d: %llx, %llx\n", + printk("Data Storage exception on %d: %lx, %lx\n", t->tid, ppc_getDAR(), ppc_getDSISR()); Systemcalls::TaskEnd(t); } @@ -94,7 +94,7 @@ namespace ExceptionHandles { bool HvEmulation(task_t* t) { - /*printk("NIP = %llx : Inst = %lx\n", + /*printk("NIP = %lx : Inst = %x\n", t->context.nip, (*(uint32_t*)t->context.nip));*/ diff --git a/src/kernel/pagemgr.C b/src/kernel/pagemgr.C index 2a92df206..972508420 100644 --- a/src/kernel/pagemgr.C +++ b/src/kernel/pagemgr.C @@ -32,7 +32,7 @@ PageManager::PageManager() size_t length = (MEMLEN - addr) / PAGESIZE; // Display. - printk("Initializing PageManager with %zd pages starting at %llx...", + printk("Initializing PageManager with %zd pages starting at %lx...", length, (uint64_t)page); |
