Merge commit 'linus/master' into merge-linus

Conflicts:

	arch/x86/kvm/i8254.c

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/powerpc/oprofile/cell/vma_map.c b/arch/powerpc/oprofile/cell/vma_map.c
index fff66662d021..258fa4411e9e 100644
--- a/arch/powerpc/oprofile/cell/vma_map.c
+++ b/arch/powerpc/oprofile/cell/vma_map.c
@@ -229,7 +229,7 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu,
          */
         overlay_tbl_offset = vma_map_lookup(map, ovly_table_sym,
                                             aSpu, &grd_val);
-        if (overlay_tbl_offset < 0) {
+        if (overlay_tbl_offset > 0x10000000) {
                 printk(KERN_ERR "SPU_PROF: "
                        "%s, line %d: Error finding SPU overlay table\n",
                        __func__, __LINE__);