Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit dcad47fc423ac9f4934579af814fa2dad5c8081b

Authored by David Gibson
Committed by Paul Mackerras
1 parent 723925b7b1
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] powerpc: Kill ppcdebug 

The ancient ppcdebug/PPCDBG mechanism is now only used in two places.
First, in the hash setup code, one of the bits allows the size of the
hash table to be reduced by a factor of 8 - which would be better
accomplished with a command line option for that purpose.  The other
was a bunch of bus walking related messages in the iSeries code, which
would seem to be insufficient reason to keep the mechanism.

This patch removes the last traces of this mechanism.

Built and booted on iSeries and pSeries POWER5 LPAR (ARCH=powerpc).

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Showing 20 changed files with 3 additions and 242 deletions Side-by-side Diff

arch/powerpc/kernel/setup_64.c
Diff comments   View file @ dcad47f
... ... @@ -41,7 +41,6 @@
41 41 #include <asm/elf.h>
42 42 #include <asm/machdep.h>
43 43 #include <asm/paca.h>
44   -#include <asm/ppcdebug.h>
45 44 #include <asm/time.h>
46 45 #include <asm/cputable.h>
47 46 #include <asm/sections.h>
... ... @@ -60,6 +59,7 @@
60 59 #include <asm/firmware.h>
61 60 #include <asm/systemcfg.h>
62 61 #include <asm/xmon.h>
  62 +#include <asm/udbg.h>
63 63  
64 64 #ifdef DEBUG
65 65 #define DBG(fmt...) udbg_printf(fmt)
... ... @@ -244,12 +244,6 @@
244 244 DBG(" -> early_setup()\n");
245 245  
246 246 /*
247   - * Fill the default DBG level (do we want to keep
248   - * that old mecanism around forever ?)
249   - */
250   - ppcdbg_initialize();
251   -
252   - /*
253 247 * Do early initializations using the flattened device
254 248 * tree, like retreiving the physical memory map or
255 249 * calculating/retreiving the hash table size
... ... @@ -516,7 +510,6 @@
516 510  
517 511 printk("-----------------------------------------------------\n");
518 512 printk("ppc64_pft_size = 0x%lx\n", ppc64_pft_size);
519   - printk("ppc64_debug_switch = 0x%lx\n", ppc64_debug_switch);
520 513 printk("ppc64_interrupt_controller = 0x%ld\n", ppc64_interrupt_controller);
521 514 printk("systemcfg = 0x%p\n", systemcfg);
522 515 printk("systemcfg->platform = 0x%x\n", systemcfg->platform);
arch/powerpc/kernel/signal_32.c
Diff comments   View file @ dcad47f
... ... @@ -44,7 +44,6 @@
44 44 #include <asm/cacheflush.h>
45 45 #ifdef CONFIG_PPC64
46 46 #include "ppc32.h"
47   -#include <asm/ppcdebug.h>
48 47 #include <asm/unistd.h>
49 48 #include <asm/vdso.h>
50 49 #else
arch/powerpc/kernel/signal_64.c
Diff comments   View file @ dcad47f
... ... @@ -33,7 +33,6 @@
33 33 #include <asm/ucontext.h>
34 34 #include <asm/uaccess.h>
35 35 #include <asm/pgtable.h>
36   -#include <asm/ppcdebug.h>
37 36 #include <asm/unistd.h>
38 37 #include <asm/cacheflush.h>
39 38 #include <asm/vdso.h>
arch/powerpc/mm/hash_utils_64.c
Diff comments   View file @ dcad47f
... ... @@ -32,7 +32,6 @@
32 32 #include <linux/init.h>
33 33 #include <linux/signal.h>
34 34  
35   -#include <asm/ppcdebug.h>
36 35 #include <asm/processor.h>
37 36 #include <asm/pgtable.h>
38 37 #include <asm/mmu.h>
... ... @@ -193,12 +192,6 @@
193 192 */
194 193 htab_size_bytes = get_hashtable_size();
195 194 pteg_count = htab_size_bytes >> 7;
196   -
197   - /* For debug, make the HTAB 1/8 as big as it normally would be. */
198   - ifppcdebug(PPCDBG_HTABSIZE) {
199   - pteg_count >>= 3;
200   - htab_size_bytes = pteg_count << 7;
201   - }
202 195  
203 196 htab_hash_mask = pteg_count - 1;
204 197  
arch/powerpc/mm/init_64.c
Diff comments   View file @ dcad47f
... ... @@ -57,7 +57,6 @@
57 57 #include <asm/processor.h>
58 58 #include <asm/mmzone.h>
59 59 #include <asm/cputable.h>
60   -#include <asm/ppcdebug.h>
61 60 #include <asm/sections.h>
62 61 #include <asm/system.h>
63 62 #include <asm/iommu.h>
arch/powerpc/mm/pgtable_64.c
Diff comments   View file @ dcad47f
... ... @@ -59,7 +59,6 @@
59 59 #include <asm/processor.h>
60 60 #include <asm/mmzone.h>
61 61 #include <asm/cputable.h>
62   -#include <asm/ppcdebug.h>
63 62 #include <asm/sections.h>
64 63 #include <asm/system.h>
65 64 #include <asm/iommu.h>
arch/powerpc/platforms/iseries/irq.c
Diff comments   View file @ dcad47f
... ... @@ -35,7 +35,6 @@
35 35 #include <linux/irq.h>
36 36 #include <linux/spinlock.h>
37 37  
38   -#include <asm/ppcdebug.h>
39 38 #include <asm/iseries/hv_types.h>
40 39 #include <asm/iseries/hv_lp_event.h>
41 40 #include <asm/iseries/hv_call_xm.h>
... ... @@ -227,8 +226,6 @@
227 226 /* Unmask secondary INTA */
228 227 mask = 0x80000000;
229 228 HvCallPci_unmaskInterrupts(bus, subBus, deviceId, mask);
230   - PPCDBG(PPCDBG_BUSWALK, "iSeries_enable_IRQ 0x%02X.%02X.%02X 0x%04X\n",
231   - bus, subBus, deviceId, irq);
232 229 }
233 230  
234 231 /* This is called by iSeries_activate_IRQs */
... ... @@ -310,8 +307,6 @@
310 307 /* Mask secondary INTA */
311 308 mask = 0x80000000;
312 309 HvCallPci_maskInterrupts(bus, subBus, deviceId, mask);
313   - PPCDBG(PPCDBG_BUSWALK, "iSeries_disable_IRQ 0x%02X.%02X.%02X 0x%04X\n",
314   - bus, subBus, deviceId, irq);
315 310 }
316 311  
317 312 /*
arch/powerpc/platforms/iseries/pci.c
Diff comments   View file @ dcad47f
... ... @@ -32,7 +32,6 @@
32 32 #include <asm/prom.h>
33 33 #include <asm/machdep.h>
34 34 #include <asm/pci-bridge.h>
35   -#include <asm/ppcdebug.h>
36 35 #include <asm/iommu.h>
37 36 #include <asm/abs_addr.h>
38 37  
... ... @@ -207,10 +206,6 @@
207 206 struct device_node *node;
208 207 struct pci_dn *pdn;
209 208  
210   - PPCDBG(PPCDBG_BUSWALK,
211   - "-build_device_node 0x%02X.%02X.%02X Function: %02X\n",
212   - Bus, SubBus, AgentId, Function);
213   -
214 209 node = kmalloc(sizeof(struct device_node), GFP_KERNEL);
215 210 if (node == NULL)
216 211 return NULL;
... ... @@ -243,8 +238,6 @@
243 238 struct pci_controller *phb;
244 239 HvBusNumber bus;
245 240  
246   - PPCDBG(PPCDBG_BUSWALK, "find_and_init_phbs Entry\n");
247   -
248 241 /* Check all possible buses. */
249 242 for (bus = 0; bus < 256; bus++) {
250 243 int ret = HvCallXm_testBus(bus);
... ... @@ -261,9 +254,6 @@
261 254 phb->last_busno = bus;
262 255 phb->ops = &iSeries_pci_ops;
263 256  
264   - PPCDBG(PPCDBG_BUSWALK, "PCI:Create iSeries pci_controller(%p), Bus: %04X\n",
265   - phb, bus);
266   -
267 257 /* Find and connect the devices. */
268 258 scan_PHB_slots(phb);
269 259 }
270 260  
... ... @@ -285,11 +275,9 @@
285 275 */
286 276 void iSeries_pcibios_init(void)
287 277 {
288   - PPCDBG(PPCDBG_BUSWALK, "iSeries_pcibios_init Entry.\n");
289 278 iomm_table_initialize();
290 279 find_and_init_phbs();
291 280 io_page_mask = -1;
292   - PPCDBG(PPCDBG_BUSWALK, "iSeries_pcibios_init Exit.\n");
293 281 }
294 282  
295 283 /*
... ... @@ -301,8 +289,6 @@
301 289 struct device_node *node;
302 290 int DeviceCount = 0;
303 291  
304   - PPCDBG(PPCDBG_BUSWALK, "iSeries_pcibios_fixup Entry.\n");
305   -
306 292 /* Fix up at the device node and pci_dev relationship */
307 293 mf_display_src(0xC9000100);
308 294  
... ... @@ -316,9 +302,6 @@
316 302 ++DeviceCount;
317 303 pdev->sysdata = (void *)node;
318 304 PCI_DN(node)->pcidev = pdev;
319   - PPCDBG(PPCDBG_BUSWALK,
320   - "pdev 0x%p <==> DevNode 0x%p\n",
321   - pdev, node);
322 305 allocate_device_bars(pdev);
323 306 iSeries_Device_Information(pdev, DeviceCount);
324 307 iommu_devnode_init_iSeries(node);
325 308  
... ... @@ -333,13 +316,10 @@
333 316  
334 317 void pcibios_fixup_bus(struct pci_bus *PciBus)
335 318 {
336   - PPCDBG(PPCDBG_BUSWALK, "iSeries_pcibios_fixup_bus(0x%04X) Entry.\n",
337   - PciBus->number);
338 319 }
339 320  
340 321 void pcibios_fixup_resources(struct pci_dev *pdev)
341 322 {
342   - PPCDBG(PPCDBG_BUSWALK, "fixup_resources pdev %p\n", pdev);
343 323 }
344 324  
345 325 /*
... ... @@ -401,9 +381,6 @@
401 381 printk("found device at bus %d idsel %d func %d (AgentId %x)\n",
402 382 bus, IdSel, Function, AgentId);
403 383 /* Connect EADs: 0x18.00.12 = 0x00 */
404   - PPCDBG(PPCDBG_BUSWALK,
405   - "PCI:Connect EADs: 0x%02X.%02X.%02X\n",
406   - bus, SubBus, AgentId);
407 384 HvRc = HvCallPci_getBusUnitInfo(bus, SubBus, AgentId,
408 385 iseries_hv_addr(BridgeInfo),
409 386 sizeof(struct HvCallPci_BridgeInfo));
... ... @@ -414,14 +391,6 @@
414 391 BridgeInfo->maxAgents,
415 392 BridgeInfo->maxSubBusNumber,
416 393 BridgeInfo->logicalSlotNumber);
417   - PPCDBG(PPCDBG_BUSWALK,
418   - "PCI: BridgeInfo, Type:0x%02X, SubBus:0x%02X, MaxAgents:0x%02X, MaxSubBus: 0x%02X, LSlot: 0x%02X\n",
419   - BridgeInfo->busUnitInfo.deviceType,
420   - BridgeInfo->subBusNumber,
421   - BridgeInfo->maxAgents,
422   - BridgeInfo->maxSubBusNumber,
423   - BridgeInfo->logicalSlotNumber);
424   -
425 394 if (BridgeInfo->busUnitInfo.deviceType ==
426 395 HvCallPci_BridgeDevice) {
427 396 /* Scan_Bridge_Slot...: 0x18.00.12 */
... ... @@ -454,9 +423,6 @@
454 423  
455 424 /* iSeries_allocate_IRQ.: 0x18.00.12(0xA3) */
456 425 Irq = iSeries_allocate_IRQ(Bus, 0, EADsIdSel);
457   - PPCDBG(PPCDBG_BUSWALK,
458   - "PCI:- allocate and assign IRQ 0x%02X.%02X.%02X = 0x%02X\n",
459   - Bus, 0, EADsIdSel, Irq);
460 426  
461 427 /*
462 428 * Connect all functions of any device found.
... ... @@ -482,9 +448,6 @@
482 448 printk("read vendor ID: %x\n", VendorId);
483 449  
484 450 /* FoundDevice: 0x18.28.10 = 0x12AE */
485   - PPCDBG(PPCDBG_BUSWALK,
486   - "PCI:- FoundDevice: 0x%02X.%02X.%02X = 0x%04X, irq %d\n",
487   - Bus, SubBus, AgentId, VendorId, Irq);
488 451 HvRc = HvCallPci_configStore8(Bus, SubBus, AgentId,
489 452 PCI_INTERRUPT_LINE, Irq);
490 453 if (HvRc != 0)
arch/powerpc/platforms/iseries/setup.c
Diff comments   View file @ dcad47f
... ... @@ -71,8 +71,6 @@
71 71 #endif
72 72  
73 73 /* Function Prototypes */
74   -extern void ppcdbg_initialize(void);
75   -
76 74 static void build_iSeries_Memory_Map(void);
77 75 static void iseries_shared_idle(void);
78 76 static void iseries_dedicated_idle(void);
... ... @@ -308,8 +306,6 @@
308 306 DBG(" -> iSeries_init_early()\n");
309 307  
310 308 ppc64_firmware_features = FW_FEATURE_ISERIES;
311   -
312   - ppcdbg_initialize();
313 309  
314 310 ppc64_interrupt_controller = IC_ISERIES;
315 311  
arch/powerpc/platforms/iseries/smp.c
Diff comments   View file @ dcad47f
... ... @@ -40,7 +40,6 @@
40 40 #include <asm/paca.h>
41 41 #include <asm/iseries/hv_call.h>
42 42 #include <asm/time.h>
43   -#include <asm/ppcdebug.h>
44 43 #include <asm/machdep.h>
45 44 #include <asm/cputable.h>
46 45 #include <asm/system.h>
arch/powerpc/platforms/pseries/iommu.c
Diff comments   View file @ dcad47f
... ... @@ -37,7 +37,6 @@
37 37 #include <asm/io.h>
38 38 #include <asm/prom.h>
39 39 #include <asm/rtas.h>
40   -#include <asm/ppcdebug.h>
41 40 #include <asm/iommu.h>
42 41 #include <asm/pci-bridge.h>
43 42 #include <asm/machdep.h>
arch/powerpc/platforms/pseries/lpar.c
Diff comments   View file @ dcad47f
... ... @@ -31,13 +31,13 @@
31 31 #include <asm/machdep.h>
32 32 #include <asm/abs_addr.h>
33 33 #include <asm/mmu_context.h>
34   -#include <asm/ppcdebug.h>
35 34 #include <asm/iommu.h>
36 35 #include <asm/tlbflush.h>
37 36 #include <asm/tlb.h>
38 37 #include <asm/prom.h>
39 38 #include <asm/abs_addr.h>
40 39 #include <asm/cputable.h>
  40 +#include <asm/udbg.h>
41 41  
42 42 #include "plpar_wrappers.h"
43 43  
arch/powerpc/platforms/pseries/ras.c
Diff comments   View file @ dcad47f
... ... @@ -48,7 +48,7 @@
48 48 #include <asm/ptrace.h>
49 49 #include <asm/machdep.h>
50 50 #include <asm/rtas.h>
51   -#include <asm/ppcdebug.h>
  51 +#include <asm/udbg.h>
52 52  
53 53 static unsigned char ras_log_buf[RTAS_ERROR_LOG_MAX];
54 54 static DEFINE_SPINLOCK(ras_log_buf_lock);
arch/powerpc/sysdev/u3_iommu.c
Diff comments   View file @ dcad47f
... ... @@ -37,7 +37,6 @@
37 37 #include <linux/vmalloc.h>
38 38 #include <asm/io.h>
39 39 #include <asm/prom.h>
40   -#include <asm/ppcdebug.h>
41 40 #include <asm/iommu.h>
42 41 #include <asm/pci-bridge.h>
43 42 #include <asm/machdep.h>
arch/ppc64/Kconfig.debug
Diff comments   View file @ dcad47f
... ... @@ -55,10 +55,6 @@
55 55 xmon is normally disabled unless booted with 'xmon=on'.
56 56 Use 'xmon=off' to disable xmon init during runtime.
57 57  
58   -config PPCDBG
59   - bool "Include PPCDBG realtime debugging"
60   - depends on DEBUG_KERNEL
61   -
62 58 config IRQSTACKS
63 59 bool "Use separate kernel stacks when processing interrupts"
64 60 help
arch/ppc64/kernel/prom.c
Diff comments   View file @ dcad47f
... ... @@ -46,7 +46,6 @@
46 46 #include <asm/pgtable.h>
47 47 #include <asm/pci.h>
48 48 #include <asm/iommu.h>
49   -#include <asm/ppcdebug.h>
50 49 #include <asm/btext.h>
51 50 #include <asm/sections.h>
52 51 #include <asm/machdep.h>
arch/ppc64/kernel/prom_init.c
Diff comments   View file @ dcad47f
... ... @@ -44,7 +44,6 @@
44 44 #include <asm/pgtable.h>
45 45 #include <asm/pci.h>
46 46 #include <asm/iommu.h>
47   -#include <asm/ppcdebug.h>
48 47 #include <asm/btext.h>
49 48 #include <asm/sections.h>
50 49 #include <asm/machdep.h>
arch/ppc64/kernel/udbg.c
Diff comments   View file @ dcad47f
... ... @@ -10,12 +10,10 @@
10 10 */
11 11  
12 12 #include <stdarg.h>
13   -#define WANT_PPCDBG_TAB /* Only defined here */
14 13 #include <linux/config.h>
15 14 #include <linux/types.h>
16 15 #include <linux/sched.h>
17 16 #include <linux/console.h>
18   -#include <asm/ppcdebug.h>
19 17 #include <asm/processor.h>
20 18  
21 19 void (*udbg_putc)(unsigned char c);
... ... @@ -87,59 +85,6 @@
87 85 vsnprintf(buf, UDBG_BUFSIZE, fmt, args);
88 86 udbg_puts(buf);
89 87 va_end(args);
90   -}
91   -
92   -/* PPCDBG stuff */
93   -
94   -u64 ppc64_debug_switch;
95   -
96   -/* Special print used by PPCDBG() macro */
97   -void udbg_ppcdbg(unsigned long debug_flags, const char *fmt, ...)
98   -{
99   - unsigned long active_debugs = debug_flags & ppc64_debug_switch;
100   -
101   - if (active_debugs) {
102   - va_list ap;
103   - unsigned char buf[UDBG_BUFSIZE];
104   - unsigned long i, len = 0;
105   -
106   - for (i=0; i < PPCDBG_NUM_FLAGS; i++) {
107   - if (((1U << i) & active_debugs) &&
108   - trace_names[i]) {
109   - len += strlen(trace_names[i]);
110   - udbg_puts(trace_names[i]);
111   - break;
112   - }
113   - }
114   -
115   - snprintf(buf, UDBG_BUFSIZE, " [%s]: ", current->comm);
116   - len += strlen(buf);
117   - udbg_puts(buf);
118   -
119   - while (len < 18) {
120   - udbg_puts(" ");
121   - len++;
122   - }
123   -
124   - va_start(ap, fmt);
125   - vsnprintf(buf, UDBG_BUFSIZE, fmt, ap);
126   - udbg_puts(buf);
127   - va_end(ap);
128   - }
129   -}
130   -
131   -unsigned long udbg_ifdebug(unsigned long flags)
132   -{
133   - return (flags & ppc64_debug_switch);
134   -}
135   -
136   -/*
137   - * Initialize the PPCDBG state. Called before relocation has been enabled.
138   - */
139   -void __init ppcdbg_initialize(void)
140   -{
141   - ppc64_debug_switch = PPC_DEBUG_DEFAULT; /* | PPCDBG_BUSWALK | */
142   - /* PPCDBG_PHBINIT | PPCDBG_MM | PPCDBG_MMINIT | PPCDBG_TCEINIT | PPCDBG_TCE */;
143 88 }
144 89  
145 90 /*
include/asm-ppc64/ppcdebug.h
View file @ dcad47f
1   -#ifndef __PPCDEBUG_H
2   -#define __PPCDEBUG_H
3   -/********************************************************************
4   - * Author: Adam Litke, IBM Corp
5   - * (c) 2001
6   - *
7   - * This file contains definitions and macros for a runtime debugging
8   - * system for ppc64 (This should also work on 32 bit with a few
9   - * adjustments.
10   - *
11   - * This program is free software; you can redistribute it and/or
12   - * modify it under the terms of the GNU General Public License
13   - * as published by the Free Software Foundation; either version
14   - * 2 of the License, or (at your option) any later version.
15   - *
16   - ********************************************************************/
17   -
18   -#include <linux/config.h>
19   -#include <linux/types.h>
20   -#include <asm/udbg.h>
21   -#include <stdarg.h>
22   -
23   -#define PPCDBG_BITVAL(X) ((1UL)<<((unsigned long)(X)))
24   -
25   -/* Defined below are the bit positions of various debug flags in the
26   - * ppc64_debug_switch variable.
27   - * -- When adding new values, please enter them into trace names below --
28   - *
29   - * Values 62 & 63 can be used to stress the hardware page table management
30   - * code. They must be set statically, any attempt to change them dynamically
31   - * would be a very bad idea.
32   - */
33   -#define PPCDBG_MMINIT PPCDBG_BITVAL(0)
34   -#define PPCDBG_MM PPCDBG_BITVAL(1)
35   -#define PPCDBG_SYS32 PPCDBG_BITVAL(2)
36   -#define PPCDBG_SYS32NI PPCDBG_BITVAL(3)
37   -#define PPCDBG_SYS32X PPCDBG_BITVAL(4)
38   -#define PPCDBG_SYS32M PPCDBG_BITVAL(5)
39   -#define PPCDBG_SYS64 PPCDBG_BITVAL(6)
40   -#define PPCDBG_SYS64NI PPCDBG_BITVAL(7)
41   -#define PPCDBG_SYS64X PPCDBG_BITVAL(8)
42   -#define PPCDBG_SIGNAL PPCDBG_BITVAL(9)
43   -#define PPCDBG_SIGNALXMON PPCDBG_BITVAL(10)
44   -#define PPCDBG_BINFMT32 PPCDBG_BITVAL(11)
45   -#define PPCDBG_BINFMT64 PPCDBG_BITVAL(12)
46   -#define PPCDBG_BINFMTXMON PPCDBG_BITVAL(13)
47   -#define PPCDBG_BINFMT_32ADDR PPCDBG_BITVAL(14)
48   -#define PPCDBG_ALIGNFIXUP PPCDBG_BITVAL(15)
49   -#define PPCDBG_TCEINIT PPCDBG_BITVAL(16)
50   -#define PPCDBG_TCE PPCDBG_BITVAL(17)
51   -#define PPCDBG_PHBINIT PPCDBG_BITVAL(18)
52   -#define PPCDBG_SMP PPCDBG_BITVAL(19)
53   -#define PPCDBG_BOOT PPCDBG_BITVAL(20)
54   -#define PPCDBG_BUSWALK PPCDBG_BITVAL(21)
55   -#define PPCDBG_PROM PPCDBG_BITVAL(22)
56   -#define PPCDBG_RTAS PPCDBG_BITVAL(23)
57   -#define PPCDBG_HTABSTRESS PPCDBG_BITVAL(62)
58   -#define PPCDBG_HTABSIZE PPCDBG_BITVAL(63)
59   -#define PPCDBG_NONE (0UL)
60   -#define PPCDBG_ALL (0xffffffffUL)
61   -
62   -/* The default initial value for the debug switch */
63   -#define PPC_DEBUG_DEFAULT 0
64   -/* #define PPC_DEBUG_DEFAULT PPCDBG_ALL */
65   -
66   -#define PPCDBG_NUM_FLAGS 64
67   -
68   -extern u64 ppc64_debug_switch;
69   -
70   -#ifdef WANT_PPCDBG_TAB
71   -/* A table of debug switch names to allow name lookup in xmon
72   - * (and whoever else wants it.
73   - */
74   -char *trace_names[PPCDBG_NUM_FLAGS] = {
75   - /* Known debug names */
76   - "mminit", "mm",
77   - "syscall32", "syscall32_ni", "syscall32x", "syscall32m",
78   - "syscall64", "syscall64_ni", "syscall64x",
79   - "signal", "signal_xmon",
80   - "binfmt32", "binfmt64", "binfmt_xmon", "binfmt_32addr",
81   - "alignfixup", "tceinit", "tce", "phb_init",
82   - "smp", "boot", "buswalk", "prom",
83   - "rtas"
84   -};
85   -#else
86   -extern char *trace_names[64];
87   -#endif /* WANT_PPCDBG_TAB */
88   -
89   -#ifdef CONFIG_PPCDBG
90   -/* Macro to conditionally print debug based on debug_switch */
91   -#define PPCDBG(...) udbg_ppcdbg(__VA_ARGS__)
92   -
93   -/* Macro to conditionally call a debug routine based on debug_switch */
94   -#define PPCDBGCALL(FLAGS,FUNCTION) ifppcdebug(FLAGS) FUNCTION
95   -
96   -/* Macros to test for debug states */
97   -#define ifppcdebug(FLAGS) if (udbg_ifdebug(FLAGS))
98   -#define ppcdebugset(FLAGS) (udbg_ifdebug(FLAGS))
99   -#define PPCDBG_BINFMT (test_thread_flag(TIF_32BIT) ? PPCDBG_BINFMT32 : PPCDBG_BINFMT64)
100   -
101   -#else
102   -#define PPCDBG(...) do {;} while (0)
103   -#define PPCDBGCALL(FLAGS,FUNCTION) do {;} while (0)
104   -#define ifppcdebug(...) if (0)
105   -#define ppcdebugset(FLAGS) (0)
106   -#endif /* CONFIG_PPCDBG */
107   -
108   -#endif /*__PPCDEBUG_H */
include/asm-ppc64/udbg.h
Diff comments   View file @ dcad47f
... ... @@ -23,9 +23,6 @@
23 23  
24 24 extern void register_early_udbg_console(void);
25 25 extern void udbg_printf(const char *fmt, ...);
26   -extern void udbg_ppcdbg(unsigned long flags, const char *fmt, ...);
27   -extern unsigned long udbg_ifdebug(unsigned long flags);
28   -extern void __init ppcdbg_initialize(void);
29 26  
30 27 extern void udbg_init_uart(void __iomem *comport, unsigned int speed);
31 28