diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-19 03:37:31 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-19 03:37:31 -0400 |
| commit | d819c49da624e3ee09b2844603d58265039eecdd (patch) | |
| tree | 09a503b98769767d81337ec8e5c14c60874a4e77 /arch/powerpc/xmon/xmon.c | |
| parent | f18f982abf183e91f435990d337164c7a43d1e6d (diff) | |
| parent | 9bedbcb207ed9a571b239231d99c8fd4a34ae24d (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'arch/powerpc/xmon/xmon.c')
| -rw-r--r-- | arch/powerpc/xmon/xmon.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 1702de9395ee..bfcf70ee8959 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c | |||
| @@ -2844,7 +2844,6 @@ static void dump_spu_fields(struct spu *spu) | |||
| 2844 | DUMP_FIELD(spu, "0x%lx", flags); | 2844 | DUMP_FIELD(spu, "0x%lx", flags); |
| 2845 | DUMP_FIELD(spu, "%d", class_0_pending); | 2845 | DUMP_FIELD(spu, "%d", class_0_pending); |
| 2846 | DUMP_FIELD(spu, "0x%lx", class_0_dar); | 2846 | DUMP_FIELD(spu, "0x%lx", class_0_dar); |
| 2847 | DUMP_FIELD(spu, "0x%lx", class_0_dsisr); | ||
| 2848 | DUMP_FIELD(spu, "0x%lx", class_1_dar); | 2847 | DUMP_FIELD(spu, "0x%lx", class_1_dar); |
| 2849 | DUMP_FIELD(spu, "0x%lx", class_1_dsisr); | 2848 | DUMP_FIELD(spu, "0x%lx", class_1_dsisr); |
| 2850 | DUMP_FIELD(spu, "0x%lx", irqs[0]); | 2849 | DUMP_FIELD(spu, "0x%lx", irqs[0]); |