diff options
| -rw-r--r-- | c/src/lib/libcpu/i386/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libcpu/i386/page.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/c/src/lib/libcpu/i386/ChangeLog b/c/src/lib/libcpu/i386/ChangeLog index 556ccf00a5..c027ca87c2 100644 --- a/c/src/lib/libcpu/i386/ChangeLog +++ b/c/src/lib/libcpu/i386/ChangeLog @@ -1,3 +1,7 @@ +2007-03-28 Joel Sherrill <joel@OARcorp.com> + + * page.c: Redo print to not have cvs conflict marker. + 2006-12-02 Ralf Corsépius <ralf.corsepius@rtems.org> * configure.ac: New BUG-REPORT address. diff --git a/c/src/lib/libcpu/i386/page.c b/c/src/lib/libcpu/i386/page.c index 62ee510b7f..649c5bba65 100644 --- a/c/src/lib/libcpu/i386/page.c +++ b/c/src/lib/libcpu/i386/page.c @@ -452,7 +452,7 @@ int _CPU_display_memory_attribute(){ regCr0.i = i386_get_cr0(); - printk("\n\n >>>>>>>>> MEMORY CACHE CONFIGURATION <<<<<<<<<<\n\n"); + printk("\n\n********* MEMORY CACHE CONFIGURATION *****\n"); printk("CR0 -> paging : %s\n",(regCr0.cr0.paging ? "ENABLE ":"DISABLE")); printk(" page-level cache : %s\n\n",(regCr0.cr0.page_level_cache_disable ? "DISABLE":"ENABLE")); |