Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 81099
b: refs/heads/master
c: db3801a
h: refs/heads/master
i:
  81097: 7acb106
  81095: ceb8808
v: v3
  • Loading branch information
Milton Miller authored and Paul Mackerras committed Dec 20, 2007
1 parent fae2d7b commit 74b5057
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 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: 6e6b44e8223a01d35fceec3631be356fbdbcf004
refs/heads/master: db3801a858e97adee0f3b4c732e6ff325d95e0a5
4 changes: 1 addition & 3 deletions trunk/arch/powerpc/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -329,11 +329,9 @@ void calculate_steal_time(void)
s64 stolen;
struct cpu_purr_data *pme;

if (!cpu_has_feature(CPU_FTR_PURR))
return;
pme = &__get_cpu_var(cpu_purr_data);
if (!pme->initialized)
return; /* this can happen in early boot */
return; /* !CPU_FTR_PURR or early in early boot */
tb = mftb();
purr = mfspr(SPRN_PURR);
stolen = (tb - pme->tb) - (purr - pme->purr);
Expand Down

0 comments on commit 74b5057

Please sign in to comment.