diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-07 17:43:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-07 17:43:08 -0500 |
| commit | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (patch) | |
| tree | a3c34ad86ccdc904bb43af6cd1cb163231c29276 /arch/powerpc/sysdev/dart_iommu.c | |
| parent | 076d022c566fddde41fd4a858dd24bacad8304d7 (diff) | |
| parent | e060e084e7d9e1c62d02cb6b8d3fe07db5317eaa (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Diffstat (limited to 'arch/powerpc/sysdev/dart_iommu.c')
| -rw-r--r-- | arch/powerpc/sysdev/dart_iommu.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c index 977de9db8754..929ad2333aab 100644 --- a/arch/powerpc/sysdev/dart_iommu.c +++ b/arch/powerpc/sysdev/dart_iommu.c | |||
| @@ -194,8 +194,6 @@ static int dart_init(struct device_node *dart_node) | |||
| 194 | * prefetching into invalid pages and corrupting data | 194 | * prefetching into invalid pages and corrupting data |
| 195 | */ | 195 | */ |
| 196 | tmp = lmb_alloc(DART_PAGE_SIZE, DART_PAGE_SIZE); | 196 | tmp = lmb_alloc(DART_PAGE_SIZE, DART_PAGE_SIZE); |
| 197 | if (!tmp) | ||
| 198 | panic("DART: Cannot allocate spare page!"); | ||
| 199 | dart_emptyval = DARTMAP_VALID | ((tmp >> DART_PAGE_SHIFT) & | 197 | dart_emptyval = DARTMAP_VALID | ((tmp >> DART_PAGE_SHIFT) & |
| 200 | DARTMAP_RPNMASK); | 198 | DARTMAP_RPNMASK); |
| 201 | 199 | ||