Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (158 commits)
  powerpc: Fix CHRP PCI config access for indirect_pci
  powerpc/chrp: Fix detection of Python PCI host bridge on IBM CHRPs
  powerpc: Fix 32-bit SMP boot on CHRP
  powerpc: Fix link errors on 32-bit machines using legacy DMA
  powerpc/pci: Improve detection of unassigned bridge resources
  hvc_console: Fix free_irq in spinlocked section
  powerpc: Get USE_STRICT_MM_TYPECHECKS working again
  powerpc: Reflect the used arguments in machine_init() prototype
  powerpc: Fix DMA offset for non-coherent DMA
  powerpc: fix fsl_upm nand driver modular build
  powerpc/83xx: add NAND support for the MPC8360E-RDK boards
  powerpc: FPGA support for GE Fanuc SBC610
  i2c: MPC8349E-mITX Power Management and GPIO expander driver
  powerpc: reserve two DMA channels for audio in MPC8610 HPCD device tree
  powerpc: document the "fsl,ssi-dma-channel" compatible property
  powerpc: disable CHRP and PMAC support in various defconfigs
  OF: add fsl,mcu-mpc8349emitx to the exception list
  powerpc/83xx: add DS1374 RTC support for the MPC837xE-MDS boards
  powerpc: remove support for bootmem-allocated memory for the DIU driver
  powerpc: remove non-dependent load fsl_booke PTE_64BIT
  ...

1 files changed, 16 insertions, 18 deletions

diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c
index d8f0329b1344..26e58630ed7b 100644
--- a/arch/powerpc/kernel/btext.c
+++ b/arch/powerpc/kernel/btext.c
@@ -442,28 +442,26 @@ void btext_drawtext(const char *c, unsigned int len)
 
 void btext_drawhex(unsigned long v)
 {
-        char *hex_table = "0123456789abcdef";
-
         if (!boot_text_mapped)
                 return;
 #ifdef CONFIG_PPC64
-        btext_drawchar(hex_table[(v >> 60) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 56) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 52) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 48) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 44) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 40) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 36) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 32) & 0x0000000FUL]);
+        btext_drawchar(hex_asc_hi(v >> 56));
+        btext_drawchar(hex_asc_lo(v >> 56));
+        btext_drawchar(hex_asc_hi(v >> 48));
+        btext_drawchar(hex_asc_lo(v >> 48));
+        btext_drawchar(hex_asc_hi(v >> 40));
+        btext_drawchar(hex_asc_lo(v >> 40));
+        btext_drawchar(hex_asc_hi(v >> 32));
+        btext_drawchar(hex_asc_lo(v >> 32));
 #endif
-        btext_drawchar(hex_table[(v >> 28) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 24) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 20) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 16) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 12) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >>  8) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >>  4) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >>  0) & 0x0000000FUL]);
+        btext_drawchar(hex_asc_hi(v >> 24));
+        btext_drawchar(hex_asc_lo(v >> 24));
+        btext_drawchar(hex_asc_hi(v >> 16));
+        btext_drawchar(hex_asc_lo(v >> 16));
+        btext_drawchar(hex_asc_hi(v >> 8));
+        btext_drawchar(hex_asc_lo(v >> 8));
+        btext_drawchar(hex_asc_hi(v));
+        btext_drawchar(hex_asc_lo(v));
         btext_drawchar(' ');
 }