diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-26 07:44:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-26 07:44:41 -0700 |
| commit | e80391500078b524083ba51c3df01bbaaecc94bb (patch) | |
| tree | ba1ed8c744654ca91ee2b71b7cdee149c8edbef1 /arch/sparc64/kernel/central.c | |
| parent | 2a4f739dfc59edd52eaa37d63af1bd830ea42318 (diff) | |
| parent | 012d64ff68f304df1c35ce5902f5023dc14b643f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix memory corruption in pci_4u_free_consistent().
[SPARC64]: Fix central/FHC bus handling on Ex000 systems.
Diffstat (limited to 'arch/sparc64/kernel/central.c')
| -rw-r--r-- | arch/sparc64/kernel/central.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/central.c b/arch/sparc64/kernel/central.c index b66336db00e..e724c54af02 100644 --- a/arch/sparc64/kernel/central.c +++ b/arch/sparc64/kernel/central.c @@ -126,6 +126,10 @@ static void probe_other_fhcs(void) int board; u32 tmp; + if (dp->parent && + dp->parent->parent != NULL) + continue; + fhc = (struct linux_fhc *) central_alloc_bootmem(sizeof(struct linux_fhc)); if (fhc == NULL) |