Merge commit '7185684' into omap-for-v3.10/timer

Conflicts:	arch/arm/plat-omap/dmtimer.c Resolve merge conflict in omap_device.c as per Lothar Waßmann <LW@KARO-electronics.de>.

Author: tmlind

arch/arm/kernel/entry-armv.S

@@ -562,21 +562,21 @@ ENDPROC(__und_usr)
 @ Fall-through from Thumb-2 __und_usr
 @
 #ifdef CONFIG_NEON
+get_thread_info r10@ get current thread
 adr	r6, .LCneon_thumb_opcodes
 b	2f
 #endif
 call_fpe:
+get_thread_info r10@ get current thread
 #ifdef CONFIG_NEON
 adr	r6, .LCneon_arm_opcodes
-2:
-ldr	r7, [r6], #4@ mask value
-cmpr7, #0@ end mask?
-beq	1f
-andr8, r0, r7
+2:	ldr	r5, [r6], #4@ mask value
 ldr	r7, [r6], #4@ opcode bits matching in mask
+cmpr5, #0@ end mask?
+beq	1f
+andr8, r0, r5
 cmpr8, r7	@ NEON instruction?
 bne	2b
-get_thread_info r10
 movr7, #1
 strb	r7, [r10, #TI_USED_CP + 10]@ mark CP#10 as used
 strb	r7, [r10, #TI_USED_CP + 11]@ mark CP#11 as used
@@ -586,7 +586,6 @@ call_fpe:
 tst	r0, #0x08000000@ only CDP/CPRT/LDC/STC have bit 27
 tstne	r0, #0x04000000@ bit 26 set on both ARM and Thumb-2
 moveq	pc, lr
-get_thread_info r10@ get current thread
 andr8, r0, #0x00000f00@ mask out CP number
  THUMB(	lsrr8, r8, #8)
 movr7, #1

arch/arm/kernel/process.c

@@ -459,15 +459,16 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
  * atomic helpers and the signal restart code. Insert it into the
  * gate_vma so that it is visible through ptrace and /proc/<pid>/mem.
  */
-static struct vm_area_struct gate_vma;
+static struct vm_area_struct gate_vma = {
+.vm_start= 0xffff0000,
+.vm_end= 0xffff0000 + PAGE_SIZE,
+.vm_flags= VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC,
+.vm_mm= &init_mm,
+};
 
 static int __init gate_vma_init(void)
 {
-gate_vma.vm_start= 0xffff0000;
-gate_vma.vm_end= 0xffff0000 + PAGE_SIZE;
-gate_vma.vm_page_prot= PAGE_READONLY_EXEC;
-gate_vma.vm_flags= VM_READ | VM_EXEC |
- VM_MAYREAD | VM_MAYEXEC;
+gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
 return 0;
 }
 arch_initcall(gate_vma_init);

arch/arm/mach-integrator/integrator_ap.c

@@ -536,16 +536,14 @@ static void __init ap_init_of(void)
  'A' + (ap_sc_id & 0x0f));
 
 soc_dev = soc_device_register(soc_dev_attr);
-if (IS_ERR_OR_NULL(soc_dev)) {
+if (IS_ERR(soc_dev)) {
 kfree(soc_dev_attr->revision);
 kfree(soc_dev_attr);
 return;
 }
 
 parent = soc_device_to_device(soc_dev);
-
-if (!IS_ERR_OR_NULL(parent))
-integrator_init_sysfs(parent, ap_sc_id);
+integrator_init_sysfs(parent, ap_sc_id);
 
 of_platform_populate(root, of_default_bus_match_table,
 ap_auxdata_lookup, parent);

arch/arm/mach-integrator/integrator_cp.c

@@ -360,17 +360,14 @@ static void __init intcp_init_of(void)
  'A' + (intcp_sc_id & 0x0f));
 
 soc_dev = soc_device_register(soc_dev_attr);
-if (IS_ERR_OR_NULL(soc_dev)) {
+if (IS_ERR(soc_dev)) {
 kfree(soc_dev_attr->revision);
 kfree(soc_dev_attr);
 return;
 }
 
 parent = soc_device_to_device(soc_dev);
-
-if (!IS_ERR_OR_NULL(parent))
-integrator_init_sysfs(parent, intcp_sc_id);
-
+integrator_init_sysfs(parent, intcp_sc_id);
 of_platform_populate(root, of_default_bus_match_table,
 intcp_auxdata_lookup, parent);
 }

arch/arm/mach-omap2/board-omap3beagle.c

@@ -479,7 +479,7 @@ static int __init beagle_opp_init(void)
 
 /* Initialize the omap3 opp table if not already created. */
 r = omap3_opp_init();
-if (IS_ERR_VALUE(r) && (r != -EEXIST)) {
+if (r < 0 && (r != -EEXIST)) {
 pr_err("%s: opp default init failed\n", __func__);
 return r;
 }

arch/arm/mach-omap2/clock.c

@@ -596,7 +596,7 @@ int __init omap2_clk_switch_mpurate_at_boot(const char *mpurate_ck_name)
 return -ENOENT;
 
 r = clk_set_rate(mpurate_ck, mpurate);
-if (IS_ERR_VALUE(r)) {
+if (r < 0) {
 WARN(1, "clock: %s: unable to set MPU rate to %d: %d\n",
  mpurate_ck_name, mpurate, r);
 clk_put(mpurate_ck);

arch/arm/mach-omap2/gpmc-onenand.c

@@ -303,7 +303,7 @@ static int omap2_onenand_setup_async(void __iomem *onenand_base)
 t = omap2_onenand_calc_async_timings();
 
 ret = gpmc_set_async_mode(gpmc_onenand_data->cs, &t);
-if (IS_ERR_VALUE(ret))
+if (ret < 0)
 return ret;
 
 omap2_onenand_set_async_mode(onenand_base);
@@ -325,7 +325,7 @@ static int omap2_onenand_setup_sync(void __iomem *onenand_base, int *freq_ptr)
 t = omap2_onenand_calc_sync_timings(gpmc_onenand_data, freq);
 
 ret = gpmc_set_sync_mode(gpmc_onenand_data->cs, &t);
-if (IS_ERR_VALUE(ret))
+if (ret < 0)
 return ret;
 
 set_onenand_cfg(onenand_base);

arch/arm/mach-omap2/gpmc.c

@@ -716,7 +716,7 @@ static int gpmc_setup_irq(void)
 return -EINVAL;
 
 gpmc_irq_start = irq_alloc_descs(-1, 0, GPMC_NR_IRQ, 0);
-if (IS_ERR_VALUE(gpmc_irq_start)) {
+if (gpmc_irq_start < 0) {
 pr_err("irq_alloc_descs failed\n");
 return gpmc_irq_start;
 }
@@ -801,7 +801,7 @@ static int gpmc_mem_init(void)
 continue;
 gpmc_cs_get_memconf(cs, &base, &size);
 rc = gpmc_cs_insert_mem(cs, base, size);
-if (IS_ERR_VALUE(rc)) {
+if (rc < 0) {
 while (--cs >= 0)
 if (gpmc_cs_mem_enabled(cs))
 gpmc_cs_delete_mem(cs);
@@ -1370,14 +1370,14 @@ static int gpmc_probe(struct platform_device *pdev)
  GPMC_REVISION_MINOR(l));
 
 rc = gpmc_mem_init();
-if (IS_ERR_VALUE(rc)) {
+if (rc < 0) {
 clk_disable_unprepare(gpmc_l3_clk);
 clk_put(gpmc_l3_clk);
 dev_err(gpmc_dev, "failed to reserve memory\n");
 return rc;
 }
 
-if (IS_ERR_VALUE(gpmc_setup_irq()))
+if (gpmc_setup_irq() < 0)
 dev_warn(gpmc_dev, "gpmc_setup_irq failed\n");
 
 /* Now the GPMC is initialised, unreserve the chip-selects */

arch/arm/mach-omap2/omap_device.c

@@ -131,7 +131,7 @@ static int omap_device_build_from_dt(struct platform_device *pdev)
 int oh_cnt, i, ret = 0;
 
 oh_cnt = of_property_count_strings(node, "ti,hwmods");
-if (!oh_cnt || IS_ERR_VALUE(oh_cnt)) {
+if (oh_cnt <= 0) {
 dev_dbg(&pdev->dev, "No 'hwmods' to build omap_device\n");
 return -ENODEV;
 }
@@ -815,20 +815,17 @@ struct device *omap_device_get_by_hwmod_name(const char *oh_name)
 }
 
 oh = omap_hwmod_lookup(oh_name);
-if (IS_ERR_OR_NULL(oh)) {
+if (!oh) {
 WARN(1, "%s: no hwmod for %s\n", __func__,
 oh_name);
-return ERR_PTR(oh ? PTR_ERR(oh) : -ENODEV);
+return ERR_PTR(-ENODEV);
 }
-if (IS_ERR_OR_NULL(oh->od)) {
+if (!oh->od) {
 WARN(1, "%s: no omap_device for %s\n", __func__,
 oh_name);
-return ERR_PTR(oh->od ? PTR_ERR(oh->od) : -ENODEV);
+return ERR_PTR(-ENODEV);
 }
 
-if (IS_ERR_OR_NULL(oh->od->pdev))
-return ERR_PTR(oh->od->pdev ? PTR_ERR(oh->od->pdev) : -ENODEV);
-
 return &oh->od->pdev->dev;
 }
 

arch/arm/mach-omap2/omap_hwmod.c

@@ -1659,7 +1659,7 @@ static int _deassert_hardreset(struct omap_hwmod *oh, const char *name)
 return -ENOSYS;
 
 ret = _lookup_hardreset(oh, name, &ohri);
-if (IS_ERR_VALUE(ret))
+if (ret < 0)
 return ret;
 
 if (oh->clkdm) {
@@ -2409,7 +2409,7 @@ static int __init _init(struct omap_hwmod *oh, void *data)
 _init_mpu_rt_base(oh, NULL);
 
 r = _init_clocks(oh, NULL);
-if (IS_ERR_VALUE(r)) {
+if (r < 0) {
 WARN(1, "omap_hwmod: %s: couldn't init clocks\n", oh->name);
 return -EINVAL;
 }