diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-26 01:08:05 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-26 01:08:05 -0400 |
| commit | ccd7bc2f67fdfa9c47ceae64f1117d1fb6cb8737 (patch) | |
| tree | 33b13cd5582c419f8ae098edb24ca355974a7ccf /arch/ppc64/kernel/iSeries_htab.c | |
| parent | 6f0ef4fa57b9ba27d7b1c330bad041f1665501fe (diff) | |
| parent | 6693e74a16ef563960764bd963f1048392135c3c (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/ppc64/kernel/iSeries_htab.c')
| -rw-r--r-- | arch/ppc64/kernel/iSeries_htab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/iSeries_htab.c b/arch/ppc64/kernel/iSeries_htab.c index 2192055a90a0..073b76661747 100644 --- a/arch/ppc64/kernel/iSeries_htab.c +++ b/arch/ppc64/kernel/iSeries_htab.c | |||
| @@ -66,7 +66,7 @@ static long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va, | |||
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | if (slot < 0) { /* MSB set means secondary group */ | 68 | if (slot < 0) { /* MSB set means secondary group */ |
| 69 | vflags |= HPTE_V_VALID; | 69 | vflags |= HPTE_V_SECONDARY; |
| 70 | secondary = 1; | 70 | secondary = 1; |
| 71 | slot &= 0x7fffffffffffffff; | 71 | slot &= 0x7fffffffffffffff; |
| 72 | } | 72 | } |