Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
33b9f582
Commit
33b9f582
authored
May 02, 2013
by
Russell King
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'cleanup' into for-linus
Conflicts: arch/arm/plat-omap/dmtimer.c
parents
946342d0
008ca431
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
51 additions
and
60 deletions
+51
-60
arch/arm/kernel/entry-armv.S
arch/arm/kernel/entry-armv.S
+6
-7
arch/arm/kernel/process.c
arch/arm/kernel/process.c
+7
-6
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-nuri.c
+1
-1
arch/arm/mach-imx/devices/devices.c
arch/arm/mach-imx/devices/devices.c
+1
-1
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/integrator_ap.c
+2
-4
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-integrator/integrator_cp.c
+2
-5
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3beagle.c
+1
-1
arch/arm/mach-omap2/clock.c
arch/arm/mach-omap2/clock.c
+1
-1
arch/arm/mach-omap2/gpmc-onenand.c
arch/arm/mach-omap2/gpmc-onenand.c
+2
-2
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/gpmc.c
+4
-4
arch/arm/mach-omap2/omap_device.c
arch/arm/mach-omap2/omap_device.c
+5
-8
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod.c
+2
-2
arch/arm/mach-omap2/pm-debug.c
arch/arm/mach-omap2/pm-debug.c
+3
-3
arch/arm/mach-omap2/powerdomain.c
arch/arm/mach-omap2/powerdomain.c
+1
-1
arch/arm/mach-omap2/timer.c
arch/arm/mach-omap2/timer.c
+1
-1
arch/arm/mach-tegra/board-harmony-pcie.c
arch/arm/mach-tegra/board-harmony-pcie.c
+3
-3
arch/arm/mach-tegra/tegra2_emc.c
arch/arm/mach-tegra/tegra2_emc.c
+1
-1
arch/arm/mach-ux500/cpu.c
arch/arm/mach-ux500/cpu.c
+2
-3
arch/arm/plat-omap/dmtimer.c
arch/arm/plat-omap/dmtimer.c
+6
-6
No files found.
arch/arm/kernel/entry-armv.S
View file @
33b9f582
...
...
@@ -520,21 +520,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
2
f
#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
cmp
r7
,
#
0
@
end
mask
?
beq
1
f
and
r8
,
r0
,
r7
2
:
ldr
r5
,
[
r6
],
#
4
@
mask
value
ldr
r7
,
[
r6
],
#
4
@
opcode
bits
matching
in
mask
cmp
r5
,
#
0
@
end
mask
?
beq
1
f
and
r8
,
r0
,
r5
cmp
r8
,
r7
@
NEON
instruction
?
bne
2
b
get_thread_info
r10
mov
r7
,
#
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
...
...
@@ -544,7 +544,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
and
r8
,
r0
,
#
0x00000f00
@
mask
out
CP
number
THUMB
(
lsr
r8
,
r8
,
#
8
)
mov
r7
,
#
1
...
...
arch/arm/kernel/process.c
View file @
33b9f582
...
...
@@ -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-exynos/mach-nuri.c
View file @
33b9f582
...
...
@@ -1251,7 +1251,7 @@ static void __init nuri_camera_init(void)
}
m5mols_board_info
.
irq
=
s5p_register_gpio_interrupt
(
GPIO_CAM_8M_ISP_INT
);
if
(
!
IS_ERR_VALUE
(
m5mols_board_info
.
irq
)
)
if
(
m5mols_board_info
.
irq
>=
0
)
s3c_gpio_cfgpin
(
GPIO_CAM_8M_ISP_INT
,
S3C_GPIO_SFN
(
0xF
));
else
pr_err
(
"%s: Failed to configure 8M_ISP_INT GPIO
\n
"
,
__func__
);
...
...
arch/arm/mach-imx/devices/devices.c
View file @
33b9f582
...
...
@@ -37,7 +37,7 @@ int __init mxc_device_init(void)
int
ret
;
ret
=
device_register
(
&
mxc_aips_bus
);
if
(
IS_ERR_VALUE
(
ret
)
)
if
(
ret
<
0
)
goto
done
;
ret
=
device_register
(
&
mxc_ahb_bus
);
...
...
arch/arm/mach-integrator/integrator_ap.c
View file @
33b9f582
...
...
@@ -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
View file @
33b9f582
...
...
@@ -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
View file @
33b9f582
...
...
@@ -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
View file @
33b9f582
...
...
@@ -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
View file @
33b9f582
...
...
@@ -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
View file @
33b9f582
...
...
@@ -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
View file @
33b9f582
...
...
@@ -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
View file @
33b9f582
...
...
@@ -1666,7 +1666,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
)
{
...
...
@@ -2416,7 +2416,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
;
}
...
...
arch/arm/mach-omap2/pm-debug.c
View file @
33b9f582
...
...
@@ -217,7 +217,7 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *dir)
return
0
;
d
=
debugfs_create_dir
(
pwrdm
->
name
,
(
struct
dentry
*
)
dir
);
if
(
!
(
IS_ERR_OR_NULL
(
d
))
)
if
(
d
)
(
void
)
debugfs_create_file
(
"suspend"
,
S_IRUGO
|
S_IWUSR
,
d
,
(
void
*
)
pwrdm
,
&
pwrdm_suspend_fops
);
...
...
@@ -261,8 +261,8 @@ static int __init pm_dbg_init(void)
return
0
;
d
=
debugfs_create_dir
(
"pm_debug"
,
NULL
);
if
(
IS_ERR_OR_NULL
(
d
)
)
return
PTR_ERR
(
d
)
;
if
(
!
d
)
return
-
EINVAL
;
(
void
)
debugfs_create_file
(
"count"
,
S_IRUGO
,
d
,
(
void
*
)
DEBUG_FILE_COUNTERS
,
&
debug_fops
);
...
...
arch/arm/mach-omap2/powerdomain.c
View file @
33b9f582
...
...
@@ -1182,7 +1182,7 @@ bool pwrdm_can_ever_lose_context(struct powerdomain *pwrdm)
{
int
i
;
if
(
IS_ERR_OR_NULL
(
pwrdm
)
)
{
if
(
!
pwrdm
)
{
pr_debug
(
"powerdomain: %s: invalid powerdomain pointer
\n
"
,
__func__
);
return
1
;
...
...
arch/arm/mach-omap2/timer.c
View file @
33b9f582
...
...
@@ -287,7 +287,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
r
=
-
EINVAL
;
}
else
{
r
=
clk_set_parent
(
timer
->
fclk
,
src
);
if
(
IS_ERR_VALUE
(
r
)
)
if
(
r
<
0
)
pr_warn
(
"%s: %s cannot set source
\n
"
,
__func__
,
oh
->
name
);
clk_put
(
src
);
...
...
arch/arm/mach-tegra/board-harmony-pcie.c
View file @
33b9f582
...
...
@@ -56,9 +56,9 @@ int __init harmony_pcie_init(void)
gpio_direction_output
(
en_vdd_1v05
,
1
);
regulator
=
regulator_get
(
NULL
,
"vdd_ldo0,vddio_pex_clk"
);
if
(
IS_ERR
_OR_NULL
(
regulator
))
{
pr_err
(
"%s: regulator_get failed: %d
\n
"
,
__func__
,
(
int
)
PTR_ERR
(
regulator
)
);
if
(
IS_ERR
(
regulator
))
{
err
=
PTR_ERR
(
regulator
);
pr_err
(
"%s: regulator_get failed: %d
\n
"
,
__func__
,
err
);
goto
err_reg
;
}
...
...
arch/arm/mach-tegra/tegra2_emc.c
View file @
33b9f582
...
...
@@ -276,7 +276,7 @@ static struct tegra_emc_pdata *tegra_emc_fill_pdata(struct platform_device *pdev
int
i
;
WARN_ON
(
pdev
->
dev
.
platform_data
);
BUG_ON
(
IS_ERR
_OR_NULL
(
c
));
BUG_ON
(
IS_ERR
(
c
));
pdata
=
devm_kzalloc
(
&
pdev
->
dev
,
sizeof
(
*
pdata
),
GFP_KERNEL
);
pdata
->
tables
=
devm_kzalloc
(
&
pdev
->
dev
,
sizeof
(
*
pdata
->
tables
),
...
...
arch/arm/mach-ux500/cpu.c
View file @
33b9f582
...
...
@@ -140,14 +140,13 @@ struct device * __init ux500_soc_device_init(const char *soc_id)
soc_info_populate
(
soc_dev_attr
,
soc_id
);
soc_dev
=
soc_device_register
(
soc_dev_attr
);
if
(
IS_ERR
_OR_NULL
(
soc_dev
))
{
if
(
IS_ERR
(
soc_dev
))
{
kfree
(
soc_dev_attr
);
return
NULL
;
}
parent
=
soc_device_to_device
(
soc_dev
);
if
(
!
IS_ERR_OR_NULL
(
parent
))
device_create_file
(
parent
,
&
ux500_soc_attr
);
device_create_file
(
parent
,
&
ux500_soc_attr
);
return
parent
;
}
arch/arm/plat-omap/dmtimer.c
View file @
33b9f582
...
...
@@ -140,8 +140,7 @@ static int omap_dm_timer_prepare(struct omap_dm_timer *timer)
*/
if
(
!
(
timer
->
capability
&
OMAP_TIMER_NEEDS_RESET
))
{
timer
->
fclk
=
clk_get
(
&
timer
->
pdev
->
dev
,
"fck"
);
if
(
WARN_ON_ONCE
(
IS_ERR_OR_NULL
(
timer
->
fclk
)))
{
timer
->
fclk
=
NULL
;
if
(
WARN_ON_ONCE
(
IS_ERR
(
timer
->
fclk
)))
{
dev_err
(
&
timer
->
pdev
->
dev
,
": No fclk handle.
\n
"
);
return
-
EINVAL
;
}
...
...
@@ -373,7 +372,7 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_modify_idlect_mask);
struct
clk
*
omap_dm_timer_get_fclk
(
struct
omap_dm_timer
*
timer
)
{
if
(
timer
)
if
(
timer
&&
!
IS_ERR
(
timer
->
fclk
)
)
return
timer
->
fclk
;
return
NULL
;
}
...
...
@@ -482,7 +481,7 @@ int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)
if
(
pdata
&&
pdata
->
set_timer_src
)
return
pdata
->
set_timer_src
(
timer
->
pdev
,
source
);
if
(
!
timer
->
fclk
)
if
(
IS_ERR
(
timer
->
fclk
)
)
return
-
EINVAL
;
switch
(
source
)
{
...
...
@@ -500,13 +499,13 @@ int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)
}
parent
=
clk_get
(
&
timer
->
pdev
->
dev
,
parent_name
);
if
(
IS_ERR
_OR_NULL
(
parent
))
{
if
(
IS_ERR
(
parent
))
{
pr_err
(
"%s: %s not found
\n
"
,
__func__
,
parent_name
);
return
-
EINVAL
;
}
ret
=
clk_set_parent
(
timer
->
fclk
,
parent
);
if
(
IS_ERR_VALUE
(
ret
)
)
if
(
ret
<
0
)
pr_err
(
"%s: failed to set %s as parent
\n
"
,
__func__
,
parent_name
);
...
...
@@ -808,6 +807,7 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
return
-
ENOMEM
;
}
timer
->
fclk
=
ERR_PTR
(
-
ENODEV
);
timer
->
io_base
=
devm_ioremap_resource
(
dev
,
mem
);
if
(
IS_ERR
(
timer
->
io_base
))
return
PTR_ERR
(
timer
->
io_base
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment