diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2009-06-09 04:50:57 -0400 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-06-09 04:50:57 -0400 |
| commit | d2dd01de9924ae24afeba5aa5bc2e08287701df6 (patch) | |
| tree | 3021bf496579a48984666355b59df5e44b42dd32 /arch/powerpc/kernel/cputable.c | |
| parent | 367d04c4ec02dad34d80452e32e3370db7fb6fee (diff) | |
| parent | 62a6f465f6572e1f28765c583c12753bb3e23715 (diff) | |
Merge commit 'tip/core/iommu' into amd-iommu/fixes
Diffstat (limited to 'arch/powerpc/kernel/cputable.c')
| -rw-r--r-- | arch/powerpc/kernel/cputable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index f9c40f869c6e..3e33fb933d99 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
| @@ -1836,7 +1836,7 @@ static void __init setup_cpu_spec(unsigned long offset, struct cpu_spec *s) | |||
| 1836 | * and, in that case, keep the current value for | 1836 | * and, in that case, keep the current value for |
| 1837 | * oprofile_cpu_type. | 1837 | * oprofile_cpu_type. |
| 1838 | */ | 1838 | */ |
| 1839 | if (old.oprofile_cpu_type == NULL) { | 1839 | if (old.oprofile_cpu_type != NULL) { |
| 1840 | t->oprofile_cpu_type = old.oprofile_cpu_type; | 1840 | t->oprofile_cpu_type = old.oprofile_cpu_type; |
| 1841 | t->oprofile_type = old.oprofile_type; | 1841 | t->oprofile_type = old.oprofile_type; |
| 1842 | } | 1842 | } |