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
b43b1ffa
Commit
b43b1ffa
authored
Oct 22, 2012
by
Russell King
Browse files
Options
Browse Files
Download
Plain Diff
Merge tag 'fixes-for-rmk' of
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
into fixes
parents
00b7dede
8e7fc18b
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
30 additions
and
16 deletions
+30
-16
arch/arm/Kconfig
arch/arm/Kconfig
+1
-0
arch/arm/Makefile
arch/arm/Makefile
+7
-6
arch/arm/boot/Makefile
arch/arm/boot/Makefile
+5
-5
arch/arm/include/asm/flat.h
arch/arm/include/asm/flat.h
+1
-1
arch/arm/include/asm/uaccess.h
arch/arm/include/asm/uaccess.h
+2
-2
arch/arm/kernel/irq.c
arch/arm/kernel/irq.c
+2
-0
arch/arm/kernel/kprobes-test-arm.c
arch/arm/kernel/kprobes-test-arm.c
+4
-0
arch/arm/lib/delay.c
arch/arm/lib/delay.c
+1
-0
arch/arm/mm/alignment.c
arch/arm/mm/alignment.c
+3
-1
arch/arm/tools/Makefile
arch/arm/tools/Makefile
+1
-1
drivers/xen/Kconfig
drivers/xen/Kconfig
+2
-0
drivers/xen/sys-hypervisor.c
drivers/xen/sys-hypervisor.c
+1
-0
No files found.
arch/arm/Kconfig
View file @
b43b1ffa
...
...
@@ -1850,6 +1850,7 @@ config XEN_DOM0
config XEN
bool "Xen guest support on ARM (EXPERIMENTAL)"
depends on EXPERIMENTAL && ARM && OF
depends on CPU_V7 && !CPU_V6
help
Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
...
...
arch/arm/Makefile
View file @
b43b1ffa
...
...
@@ -21,8 +21,6 @@ endif
OBJCOPYFLAGS
:=
-O
binary
-R
.comment
-S
GZFLAGS
:=
-9
#KBUILD_CFLAGS +=-pipe
# Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:
KBUILD_CFLAGS
+=
$(
call
cc-option,-marm,
)
# Never generate .eh_frame
KBUILD_CFLAGS
+=
$(
call
cc-option,-fno-dwarf2-cfi-asm
)
...
...
@@ -105,17 +103,20 @@ endif
ifeq
($(CONFIG_THUMB2_KERNEL),y)
AFLAGS_AUTOIT
:=
$(
call
as-option,-Wa
$(comma)
-mimplicit-it
=
always,-Wa
$(comma)
-mauto-it
)
AFLAGS_NOWARN
:=
$(
call
as-option,-Wa
$(comma)
-mno-warn-deprecated
,-Wa
$(comma)
-W
)
CFLAGS_
THUMB2
:=
-mthumb
$(AFLAGS_AUTOIT)
$(AFLAGS_NOWARN)
AFLAGS_
THUMB2
:=
$(CFLAGS_THUMB2
)
-Wa
$(comma)
-mthumb
CFLAGS_
ISA
:=
-mthumb
$(AFLAGS_AUTOIT)
$(AFLAGS_NOWARN)
AFLAGS_
ISA
:=
$(CFLAGS_ISA
)
-Wa
$(comma)
-mthumb
# Work around buggy relocation from gas if requested:
ifeq
($(CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11),y)
CFLAGS_MODULE
+=
-fno-optimize-sibling-calls
endif
else
CFLAGS_ISA
:=
$(
call
cc-option,-marm,
)
AFLAGS_ISA
:=
$(CFLAGS_ISA)
endif
# Need -Uarm for gcc < 3.x
KBUILD_CFLAGS
+=
$(CFLAGS_ABI)
$(CFLAGS_
THUMB2
)
$
(
arch-y
)
$
(
tune-y
)
$(
call
cc-option,-mshort-load-bytes,
$(
call
cc-option,-malignment-traps,
))
-msoft-float
-Uarm
KBUILD_AFLAGS
+=
$(CFLAGS_ABI)
$(AFLAGS_
THUMB2
)
$
(
arch-y
)
$
(
tune-y
)
-include
asm/unified.h
-msoft-float
KBUILD_CFLAGS
+=
$(CFLAGS_ABI)
$(CFLAGS_
ISA
)
$
(
arch-y
)
$
(
tune-y
)
$(
call
cc-option,-mshort-load-bytes,
$(
call
cc-option,-malignment-traps,
))
-msoft-float
-Uarm
KBUILD_AFLAGS
+=
$(CFLAGS_ABI)
$(AFLAGS_
ISA
)
$
(
arch-y
)
$
(
tune-y
)
-include
asm/unified.h
-msoft-float
CHECKFLAGS
+=
-D__arm__
...
...
arch/arm/boot/Makefile
View file @
b43b1ffa
...
...
@@ -33,7 +33,7 @@ ifeq ($(CONFIG_XIP_KERNEL),y)
$(obj)/xipImage
:
vmlinux FORCE
$(
call
if_changed,objcopy
)
@
echo
' Kernel: $@ is ready (physical address:
$(CONFIG_XIP_PHYS_ADDR)
)'
$(kecho)
' Kernel: $@ is ready (physical address:
$(CONFIG_XIP_PHYS_ADDR)
)'
$(obj)/Image $(obj)/zImage
:
FORCE
@
echo
'Kernel configured for XIP (CONFIG_XIP_KERNEL=y)'
...
...
@@ -48,14 +48,14 @@ $(obj)/xipImage: FORCE
$(obj)/Image
:
vmlinux FORCE
$(
call
if_changed,objcopy
)
@
echo
' Kernel: $@ is ready'
$(kecho)
' Kernel: $@ is ready'
$(obj)/compressed/vmlinux
:
$(obj)/Image FORCE
$(Q)$(MAKE)
$(build)
=
$(obj)
/compressed
$@
$(obj)/zImage
:
$(obj)/compressed/vmlinux FORCE
$(
call
if_changed,objcopy
)
@
echo
' Kernel: $@ is ready'
$(kecho)
' Kernel: $@ is ready'
endif
...
...
@@ -90,7 +90,7 @@ fi
$(obj)/uImage
:
$(obj)/zImage FORCE
@
$(check_for_multiple_loadaddr)
$(
call
if_changed,uimage
)
@
echo
' Image $@ is ready'
$(kecho)
' Image $@ is ready'
$(obj)/bootp/bootp
:
$(obj)/zImage initrd FORCE
$(Q)$(MAKE)
$(build)
=
$(obj)
/bootp
$@
...
...
@@ -98,7 +98,7 @@ $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
$(obj)/bootpImage
:
$(obj)/bootp/bootp FORCE
$(
call
if_changed,objcopy
)
@
echo
' Kernel: $@ is ready'
$(kecho)
' Kernel: $@ is ready'
PHONY
+=
initrd FORCE
initrd
:
...
...
arch/arm/include/asm/flat.h
View file @
b43b1ffa
...
...
@@ -8,7 +8,7 @@
#define flat_argvp_envp_on_stack() 1
#define flat_old_ram_flag(flags) (flags)
#define flat_reloc_valid(reloc, size) ((reloc) <= (size))
#define flat_get_addr_from_rp(rp, relval, flags, persistent)
get_unaligned(rp
)
#define flat_get_addr_from_rp(rp, relval, flags, persistent)
((void)persistent,get_unaligned(rp)
)
#define flat_put_addr_at_rp(rp, val, relval) put_unaligned(val,rp)
#define flat_get_relocate_addr(rel) (rel)
#define flat_set_persistent(relval, p) 0
...
...
arch/arm/include/asm/uaccess.h
View file @
b43b1ffa
...
...
@@ -200,8 +200,8 @@ extern int __put_user_8(void *, unsigned long long);
#define USER_DS KERNEL_DS
#define segment_eq(a,b) (1)
#define __addr_ok(addr) (1)
#define __range_ok(addr,size) (0)
#define __addr_ok(addr) (
(void)(addr),
1)
#define __range_ok(addr,size) (
(void)(addr),
0)
#define get_fs() (KERNEL_DS)
static
inline
void
set_fs
(
mm_segment_t
fs
)
...
...
arch/arm/kernel/irq.c
View file @
b43b1ffa
...
...
@@ -34,6 +34,7 @@
#include <linux/list.h>
#include <linux/kallsyms.h>
#include <linux/proc_fs.h>
#include <linux/export.h>
#include <asm/exception.h>
#include <asm/mach/arch.h>
...
...
@@ -109,6 +110,7 @@ void set_irq_flags(unsigned int irq, unsigned int iflags)
/* Order is clear bits in "clr" then set bits in "set" */
irq_modify_status
(
irq
,
clr
,
set
&
~
clr
);
}
EXPORT_SYMBOL_GPL
(
set_irq_flags
);
void
__init
init_IRQ
(
void
)
{
...
...
arch/arm/kernel/kprobes-test-arm.c
View file @
b43b1ffa
...
...
@@ -366,7 +366,9 @@ void kprobe_arm_test_cases(void)
TEST_UNSUPPORTED
(
".word 0xe04f0392 @ umaal r0, pc, r2, r3"
)
TEST_UNSUPPORTED
(
".word 0xe0500090 @ undef"
)
TEST_UNSUPPORTED
(
".word 0xe05fff9f @ undef"
)
#endif
#if __LINUX_ARM_ARCH__ >= 7
TEST_RRR
(
"mls r0, r"
,
1
,
VAL1
,
", r"
,
2
,
VAL2
,
", r"
,
3
,
VAL3
,
""
)
TEST_RRR
(
"mlshi r7, r"
,
8
,
VAL3
,
", r"
,
9
,
VAL1
,
", r"
,
10
,
VAL2
,
""
)
TEST_RR
(
"mls lr, r"
,
1
,
VAL2
,
", r"
,
2
,
VAL3
,
", r13"
)
...
...
@@ -456,6 +458,8 @@ void kprobe_arm_test_cases(void)
TEST_UNSUPPORTED
(
".word 0xe1700090"
)
/* Unallocated space */
#if __LINUX_ARM_ARCH__ >= 6
TEST_UNSUPPORTED
(
"ldrex r2, [sp]"
)
#endif
#if (__LINUX_ARM_ARCH__ >= 7) || defined(CONFIG_CPU_32v6K)
TEST_UNSUPPORTED
(
"strexd r0, r2, r3, [sp]"
)
TEST_UNSUPPORTED
(
"ldrexd r2, r3, [sp]"
)
TEST_UNSUPPORTED
(
"strexb r0, r2, [sp]"
)
...
...
arch/arm/lib/delay.c
View file @
b43b1ffa
...
...
@@ -45,6 +45,7 @@ int read_current_timer(unsigned long *timer_val)
*
timer_val
=
delay_timer
->
read_current_timer
();
return
0
;
}
EXPORT_SYMBOL_GPL
(
read_current_timer
);
static
void
__timer_delay
(
unsigned
long
cycles
)
{
...
...
arch/arm/mm/alignment.c
View file @
b43b1ffa
...
...
@@ -856,8 +856,10 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
if
(
thumb2_32b
)
{
offset
.
un
=
0
;
handler
=
do_alignment_t32_to_handler
(
&
instr
,
regs
,
&
offset
);
}
else
}
else
{
offset
.
un
=
0
;
handler
=
do_alignment_ldmstm
;
}
break
;
default:
...
...
arch/arm/tools/Makefile
View file @
b43b1ffa
...
...
@@ -5,6 +5,6 @@
#
include/generated/mach-types.h
:
$(src)/gen-mach-types $(src)/mach-types
@
echo
' Generating $@'
$(kecho)
' Generating $@'
@
mkdir
-p
$(
dir
$@
)
$(Q)$(AWK)
-f
$^
>
$@
||
{
rm
-f
$@
;
/bin/false
;
}
drivers/xen/Kconfig
View file @
b43b1ffa
...
...
@@ -3,6 +3,7 @@ menu "Xen driver support"
config XEN_BALLOON
bool "Xen memory balloon driver"
depends on !ARM
default y
help
The balloon driver allows the Xen domain to request more memory from
...
...
@@ -145,6 +146,7 @@ config SWIOTLB_XEN
config XEN_TMEM
bool
depends on !ARM
default y if (CLEANCACHE || FRONTSWAP)
help
Shim to interface in-kernel Transcendent Memory hooks
...
...
drivers/xen/sys-hypervisor.c
View file @
b43b1ffa
...
...
@@ -11,6 +11,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/kobject.h>
#include <linux/err.h>
#include <asm/xen/hypervisor.h>
#include <asm/xen/hypercall.h>
...
...
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