Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 9389
b: refs/heads/master
c: f4208b9
h: refs/heads/master
i:
  9387: c2bee98
v: v3
  • Loading branch information
Benjamin Herrenschmidt authored and Linus Torvalds committed Sep 28, 2005
1 parent 55d5240 commit 125ba4e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f36462f078403c1859a7e58177b28e01b3a179e4
refs/heads/master: f4208b9a9538baabad197276076bc1d4f52d42b9
3 changes: 1 addition & 2 deletions trunk/arch/ppc/kernel/perfmon.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ static void dummy_perf(struct pt_regs *regs)
mtpmr(PMRN_PMGC0, pmgc0);
}

#elif CONFIG_6xx
#elif defined(CONFIG_6xx)
/* Ensure exceptions are disabled */

static void dummy_perf(struct pt_regs *regs)
{
unsigned int mmcr0 = mfspr(SPRN_MMCR0);
Expand Down

0 comments on commit 125ba4e

Please sign in to comment.