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
2f8269da
Commit
2f8269da
authored
Aug 06, 2004
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents
8348de40
92ec223d
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
151 additions
and
149 deletions
+151
-149
arch/arm/boot/bootp/init.S
arch/arm/boot/bootp/init.S
+3
-1
arch/arm/configs/s3c2410_defconfig
arch/arm/configs/s3c2410_defconfig
+136
-129
arch/arm/mach-s3c2410/Kconfig
arch/arm/mach-s3c2410/Kconfig
+5
-2
arch/arm/mach-s3c2410/mach-smdk2410.c
arch/arm/mach-s3c2410/mach-smdk2410.c
+1
-1
arch/arm/mach-s3c2410/mach-vr1000.c
arch/arm/mach-s3c2410/mach-vr1000.c
+2
-1
arch/arm/mm/fault.c
arch/arm/mm/fault.c
+0
-2
arch/arm/mm/init.c
arch/arm/mm/init.c
+2
-9
drivers/video/sa1100fb.c
drivers/video/sa1100fb.c
+2
-4
No files found.
arch/arm/boot/bootp/init.S
View file @
2f8269da
...
...
@@ -20,8 +20,10 @@
.
type
_start
,
#
function
.
globl
_start
_start
:
adr
r13
,
data
_start
:
add
lr
,
pc
,
#-
0x8
@
lr
=
current
load
addr
adr
r13
,
data
ldmia
r13
!,
{
r4
-
r6
}
@
r5
=
dest
,
r6
=
length
add
r4
,
r4
,
lr
@
r4
=
initrd_start
+
load
addr
bl
move
@
move
the
initrd
/*
...
...
arch/arm/configs/s3c2410_defconfig
View file @
2f8269da
This diff is collapsed.
Click to expand it.
arch/arm/mach-s3c2410/Kconfig
View file @
2f8269da
...
...
@@ -23,9 +23,12 @@ config ARCH_SMDK2410
<http://www.fsforth.de>
config MACH_VR1000
bool "
Simtec
VR1000"
bool "
Thorcom
VR1000"
help
Say Y here if you are using the Simtec VR1000 board.
Say Y here if you are using the Thorcom VR1000 board.
This linux port is currently being maintained by Simtec, on behalf
of Thorcom. Any queries, please contact Thorcom first.
endmenu
...
...
arch/arm/mach-s3c2410/mach-smdk2410.c
View file @
2f8269da
...
...
@@ -101,7 +101,7 @@ void __init smdk2410_init_irq(void)
void
__init
smdk2410_init_time
(
void
)
{
s3c24
01
_init_time
();
s3c24
10
_init_time
();
}
MACHINE_START
(
SMDK2410
,
"SMDK2410"
)
/* @TODO: request a new identifier and switch
...
...
arch/arm/mach-s3c2410/mach-vr1000.c
View file @
2f8269da
...
...
@@ -11,6 +11,7 @@
* published by the Free Software Foundation.
*
* Modifications:
* 06-Aug-2004 BJD Fixed call to time initialisation
* 12-Jul-2004 BJD Renamed machine
* 16-May-2003 BJD Created initial version
* 16-Aug-2003 BJD Fixed header files and copyright, added URL
...
...
@@ -159,7 +160,7 @@ void __init vr1000_init_irq(void)
void
__init
vr1000_init_time
(
void
)
{
s3c24
01
_init_time
();
s3c24
10
_init_time
();
}
MACHINE_START
(
VR1000
,
"Thorcom-VR1000"
)
...
...
arch/arm/mm/fault.c
View file @
2f8269da
...
...
@@ -66,9 +66,7 @@ void show_pte(struct mm_struct *mm, unsigned long addr)
/* We must not map this if we have highmem enabled */
pte
=
pte_offset_map
(
pmd
,
addr
);
printk
(
", *pte=%08lx"
,
pte_val
(
*
pte
));
#ifdef CONFIG_CPU_32
printk
(
", *ppte=%08lx"
,
pte_val
(
pte
[
-
PTRS_PER_PTE
]));
#endif
pte_unmap
(
pte
);
#endif
}
while
(
0
);
...
...
arch/arm/mm/init.c
View file @
2f8269da
...
...
@@ -24,13 +24,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#ifdef CONFIG_CPU_32
#define TABLE_OFFSET (PTRS_PER_PTE)
#else
#define TABLE_OFFSET 0
#endif
#define TABLE_SIZE ((TABLE_OFFSET + PTRS_PER_PTE) * sizeof(pte_t))
#define TABLE_SIZE (2 * PTRS_PER_PTE * sizeof(pte_t))
DEFINE_PER_CPU
(
struct
mmu_gather
,
mmu_gathers
);
...
...
@@ -289,14 +283,13 @@ static __init void reserve_node_zero(unsigned int bootmap_pfn, unsigned int boot
*/
reserve_bootmem_node
(
pgdat
,
__pa
(
&
_stext
),
&
_end
-
&
_stext
);
#ifdef CONFIG_CPU_32
/*
* Reserve the page tables. These are already in use,
* and can only be in node 0.
*/
reserve_bootmem_node
(
pgdat
,
__pa
(
swapper_pg_dir
),
PTRS_PER_PGD
*
sizeof
(
pgd_t
));
#endif
/*
* And don't forget to reserve the allocator bitmap,
* which will be freed later.
...
...
drivers/video/sa1100fb.c
View file @
2f8269da
...
...
@@ -1291,8 +1291,7 @@ static void sa1100fb_enable_controller(struct sa1100fb_info *fbi)
#error Where is GPIO24 set as an output? Can we fit this in somewhere else?
if
(
machine_is_graphicsclient
())
{
// From ADS doc again...same as disable
set_current_state
(
TASK_UNINTERRUPTIBLE
);
schedule_timeout
(
20
*
HZ
/
1000
);
msleep
(
20
);
GPSR
|=
GPIO_GPIO24
;
}
#endif
...
...
@@ -1327,8 +1326,7 @@ static void sa1100fb_disable_controller(struct sa1100fb_info *fbi)
* We'll wait 20msec.
*/
GPCR
|=
GPIO_GPIO24
;
set_current_state
(
TASK_UNINTERRUPTIBLE
);
schedule_timeout
(
20
*
HZ
/
1000
);
msleep
(
20
);
}
#endif
#ifdef CONFIG_SA1100_HUW_WEBPANEL
...
...
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