Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 1823
b: refs/heads/master
c: 8be3de3
h: refs/heads/master
i:
  1821: 3071f49
  1819: 0045a48
  1815: c3b88cb
  1807: 9410ed0
  1791: 2d308cf
v: v3
  • Loading branch information
Nathan Lynch authored and Linus Torvalds committed Jun 3, 2005
1 parent 7b2f1f5 commit a6d4211
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 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: d8d088d25822b0199fdfb392085e1cf8a5914a97
refs/heads/master: 8be3de3fd8469154a2b3e18a4712032dac5b4a53
2 changes: 1 addition & 1 deletion trunk/arch/ppc64/kernel/prom_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -1370,7 +1370,7 @@ static int __init prom_find_machine_type(void)
}
/* Default to pSeries. We need to know if we are running LPAR */
rtas = call_prom("finddevice", 1, 1, ADDR("/rtas"));
if (!PHANDLE_VALID(rtas)) {
if (PHANDLE_VALID(rtas)) {
int x = prom_getproplen(rtas, "ibm,hypertas-functions");
if (x != PROM_ERROR) {
prom_printf("Hypertas detected, assuming LPAR !\n");
Expand Down

0 comments on commit a6d4211

Please sign in to comment.