diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-16 18:33:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-16 18:33:49 +0100 |
| commit | ee1156c11a1121e118b0a7f2dec240f0d421b1fd (patch) | |
| tree | b8771cc5a9758af9d7410fc519227c036c222130 /arch/sparc/kernel/of_device_64.c | |
| parent | b9f8fcd55bbdb037e5332dbdb7b494f0b70861ac (diff) | |
| parent | 8bea8672edfca7ec5f661cafb218f1205863b343 (diff) | |
Merge branch 'linus' into sched/urgent
Conflicts:
kernel/sched_idletask.c
Merge reason: resolve the conflicts, pick up latest changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sparc/kernel/of_device_64.c')
| -rw-r--r-- | arch/sparc/kernel/of_device_64.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c index 881947e59e9..0a6f2d1798d 100644 --- a/arch/sparc/kernel/of_device_64.c +++ b/arch/sparc/kernel/of_device_64.c @@ -104,9 +104,19 @@ static int of_bus_pci_map(u32 *addr, const u32 *range, int i; /* Check address type match */ - if ((addr[0] ^ range[0]) & 0x03000000) - return -EINVAL; + if (!((addr[0] ^ range[0]) & 0x03000000)) + goto type_match; + + /* Special exception, we can map a 64-bit address into + * a 32-bit range. + */ + if ((addr[0] & 0x03000000) == 0x03000000 && + (range[0] & 0x03000000) == 0x02000000) + goto type_match; + + return -EINVAL; +type_match: if (of_out_of_range(addr + 1, range + 1, range + na + pna, na - 1, ns)) return -EINVAL; |