Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci-2.6.23
Commits
a5222049
Commit
a5222049
authored
Feb 17, 2006
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/rmk/linux-2.6-arm
parents
7054ec7f
d9db950c
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
78 additions
and
23 deletions
+78
-23
arch/arm/kernel/calls.S
arch/arm/kernel/calls.S
+1
-1
arch/arm/kernel/setup.c
arch/arm/kernel/setup.c
+5
-0
arch/arm/kernel/smp.c
arch/arm/kernel/smp.c
+0
-1
arch/arm/kernel/sys_oabi-compat.c
arch/arm/kernel/sys_oabi-compat.c
+30
-0
arch/arm/mach-integrator/platsmp.c
arch/arm/mach-integrator/platsmp.c
+15
-6
arch/arm/mach-iop3xx/iop321-setup.c
arch/arm/mach-iop3xx/iop321-setup.c
+0
-1
arch/arm/mach-iop3xx/iop331-setup.c
arch/arm/mach-iop3xx/iop331-setup.c
+0
-1
arch/arm/mach-ixp4xx/nslu2-setup.c
arch/arm/mach-ixp4xx/nslu2-setup.c
+4
-2
arch/arm/mach-realview/platsmp.c
arch/arm/mach-realview/platsmp.c
+15
-6
arch/arm/plat-omap/pm.c
arch/arm/plat-omap/pm.c
+0
-1
drivers/video/s3c2410fb.c
drivers/video/s3c2410fb.c
+0
-1
include/asm-arm/smp.h
include/asm-arm/smp.h
+5
-0
include/asm-arm/unistd.h
include/asm-arm/unistd.h
+3
-3
No files found.
arch/arm/kernel/calls.S
View file @
a5222049
...
...
@@ -111,7 +111,7 @@
CALL
(
sys_statfs
)
/*
100
*/
CALL
(
sys_fstatfs
)
CALL
(
sys_ni_syscall
)
CALL
(
OBSOLETE
(
sys_socketcall
))
CALL
(
OBSOLETE
(
ABI
(
sys_socketcall
,
sys_oabi_socketcall
)
))
CALL
(
sys_syslog
)
CALL
(
sys_setitimer
)
/*
105
*/
CALL
(
sys_getitimer
)
...
...
arch/arm/kernel/setup.c
View file @
a5222049
...
...
@@ -23,6 +23,7 @@
#include <linux/root_dev.h>
#include <linux/cpu.h>
#include <linux/interrupt.h>
#include <linux/smp.h>
#include <asm/cpu.h>
#include <asm/elf.h>
...
...
@@ -771,6 +772,10 @@ void __init setup_arch(char **cmdline_p)
paging_init
(
&
meminfo
,
mdesc
);
request_standard_resources
(
&
meminfo
,
mdesc
);
#ifdef CONFIG_SMP
smp_init_cpus
();
#endif
cpu_init
();
/*
...
...
arch/arm/kernel/smp.c
View file @
a5222049
...
...
@@ -338,7 +338,6 @@ void __init smp_prepare_boot_cpu(void)
per_cpu
(
cpu_data
,
cpu
).
idle
=
current
;
cpu_set
(
cpu
,
cpu_possible_map
);
cpu_set
(
cpu
,
cpu_present_map
);
cpu_set
(
cpu
,
cpu_online_map
);
}
...
...
arch/arm/kernel/sys_oabi-compat.c
View file @
a5222049
...
...
@@ -64,6 +64,7 @@
* sys_connect:
* sys_sendmsg:
* sys_sendto:
* sys_socketcall:
*
* struct sockaddr_un loses its padding with EABI. Since the size of the
* structure is used as a validation test in unix_mkname(), we need to
...
...
@@ -78,6 +79,7 @@
#include <linux/eventpoll.h>
#include <linux/sem.h>
#include <linux/socket.h>
#include <linux/net.h>
#include <asm/ipc.h>
#include <asm/uaccess.h>
...
...
@@ -408,3 +410,31 @@ asmlinkage long sys_oabi_sendmsg(int fd, struct msghdr __user *msg, unsigned fla
return
sys_sendmsg
(
fd
,
msg
,
flags
);
}
asmlinkage
long
sys_oabi_socketcall
(
int
call
,
unsigned
long
__user
*
args
)
{
unsigned
long
r
=
-
EFAULT
,
a
[
6
];
switch
(
call
)
{
case
SYS_BIND
:
if
(
copy_from_user
(
a
,
args
,
3
*
sizeof
(
long
))
==
0
)
r
=
sys_oabi_bind
(
a
[
0
],
(
struct
sockaddr
__user
*
)
a
[
1
],
a
[
2
]);
break
;
case
SYS_CONNECT
:
if
(
copy_from_user
(
a
,
args
,
3
*
sizeof
(
long
))
==
0
)
r
=
sys_oabi_connect
(
a
[
0
],
(
struct
sockaddr
__user
*
)
a
[
1
],
a
[
2
]);
break
;
case
SYS_SENDTO
:
if
(
copy_from_user
(
a
,
args
,
6
*
sizeof
(
long
))
==
0
)
r
=
sys_oabi_sendto
(
a
[
0
],
(
void
__user
*
)
a
[
1
],
a
[
2
],
a
[
3
],
(
struct
sockaddr
__user
*
)
a
[
4
],
a
[
5
]);
break
;
case
SYS_SENDMSG
:
if
(
copy_from_user
(
a
,
args
,
3
*
sizeof
(
long
))
==
0
)
r
=
sys_oabi_sendmsg
(
a
[
0
],
(
struct
msghdr
__user
*
)
a
[
1
],
a
[
2
]);
break
;
default:
r
=
sys_socketcall
(
call
,
args
);
}
return
r
;
}
arch/arm/mach-integrator/platsmp.c
View file @
a5222049
...
...
@@ -140,6 +140,18 @@ static void __init poke_milo(void)
mb
();
}
/*
* Initialise the CPU possible map early - this describes the CPUs
* which may be present or become present in the system.
*/
void
__init
smp_init_cpus
(
void
)
{
unsigned
int
i
,
ncores
=
get_core_count
();
for
(
i
=
0
;
i
<
ncores
;
i
++
)
cpu_set
(
i
,
cpu_possible_map
);
}
void
__init
smp_prepare_cpus
(
unsigned
int
max_cpus
)
{
unsigned
int
ncores
=
get_core_count
();
...
...
@@ -176,14 +188,11 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
max_cpus
=
ncores
;
/*
* Initialise the possible/present maps.
* cpu_possible_map describes the set of CPUs which may be present
* cpu_present_map describes the set of CPUs populated
* Initialise the present map, which describes the set of CPUs
* actually populated at the present time.
*/
for
(
i
=
0
;
i
<
max_cpus
;
i
++
)
{
cpu_set
(
i
,
cpu_possible_map
);
for
(
i
=
0
;
i
<
max_cpus
;
i
++
)
cpu_set
(
i
,
cpu_present_map
);
}
/*
* Do we need any more CPUs? If so, then let them know where
...
...
arch/arm/mach-iop3xx/iop321-setup.c
View file @
a5222049
...
...
@@ -13,7 +13,6 @@
#include <linux/mm.h>
#include <linux/init.h>
#include <linux/config.h>
#include <linux/init.h>
#include <linux/major.h>
#include <linux/fs.h>
#include <linux/platform_device.h>
...
...
arch/arm/mach-iop3xx/iop331-setup.c
View file @
a5222049
...
...
@@ -12,7 +12,6 @@
#include <linux/mm.h>
#include <linux/init.h>
#include <linux/config.h>
#include <linux/init.h>
#include <linux/major.h>
#include <linux/fs.h>
#include <linux/platform_device.h>
...
...
arch/arm/mach-ixp4xx/nslu2-setup.c
View file @
a5222049
...
...
@@ -27,8 +27,6 @@ static struct flash_platform_data nslu2_flash_data = {
};
static
struct
resource
nslu2_flash_resource
=
{
.
start
=
NSLU2_FLASH_BASE
,
.
end
=
NSLU2_FLASH_BASE
+
NSLU2_FLASH_SIZE
,
.
flags
=
IORESOURCE_MEM
,
};
...
...
@@ -116,6 +114,10 @@ static void __init nslu2_init(void)
{
ixp4xx_sys_init
();
nslu2_flash_resource
.
start
=
IXP4XX_EXP_BUS_BASE
(
0
);
nslu2_flash_resource
.
end
=
IXP4XX_EXP_BUS_BASE
(
0
)
+
ixp4xx_exp_bus_size
-
1
;
pm_power_off
=
nslu2_power_off
;
platform_add_devices
(
nslu2_devices
,
ARRAY_SIZE
(
nslu2_devices
));
...
...
arch/arm/mach-realview/platsmp.c
View file @
a5222049
...
...
@@ -143,6 +143,18 @@ static void __init poke_milo(void)
mb
();
}
/*
* Initialise the CPU possible map early - this describes the CPUs
* which may be present or become present in the system.
*/
void
__init
smp_init_cpus
(
void
)
{
unsigned
int
i
,
ncores
=
get_core_count
();
for
(
i
=
0
;
i
<
ncores
;
i
++
)
cpu_set
(
i
,
cpu_possible_map
);
}
void
__init
smp_prepare_cpus
(
unsigned
int
max_cpus
)
{
unsigned
int
ncores
=
get_core_count
();
...
...
@@ -179,14 +191,11 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
local_timer_setup
(
cpu
);
/*
* Initialise the possible/present maps.
* cpu_possible_map describes the set of CPUs which may be present
* cpu_present_map describes the set of CPUs populated
* Initialise the present map, which describes the set of CPUs
* actually populated at the present time.
*/
for
(
i
=
0
;
i
<
max_cpus
;
i
++
)
{
cpu_set
(
i
,
cpu_possible_map
);
for
(
i
=
0
;
i
<
max_cpus
;
i
++
)
cpu_set
(
i
,
cpu_present_map
);
}
/*
* Do we need any more CPUs? If so, then let them know where
...
...
arch/arm/plat-omap/pm.c
View file @
a5222049
...
...
@@ -38,7 +38,6 @@
#include <linux/pm.h>
#include <linux/sched.h>
#include <linux/proc_fs.h>
#include <linux/pm.h>
#include <linux/interrupt.h>
#include <asm/io.h>
...
...
drivers/video/s3c2410fb.c
View file @
a5222049
...
...
@@ -82,7 +82,6 @@
#include <linux/fb.h>
#include <linux/init.h>
#include <linux/dma-mapping.h>
#include <linux/string.h>
#include <linux/interrupt.h>
#include <linux/workqueue.h>
#include <linux/wait.h>
...
...
include/asm-arm/smp.h
View file @
a5222049
...
...
@@ -41,6 +41,11 @@ extern void show_ipi_list(struct seq_file *p);
*/
asmlinkage
void
do_IPI
(
struct
pt_regs
*
regs
);
/*
* Setup the SMP cpu_possible_map
*/
extern
void
smp_init_cpus
(
void
);
/*
* Move global data into per-processor storage.
*/
...
...
include/asm-arm/unistd.h
View file @
a5222049
...
...
@@ -309,7 +309,7 @@
#define __NR_mq_getsetattr (__NR_SYSCALL_BASE+279)
#define __NR_waitid (__NR_SYSCALL_BASE+280)
#if
0
/* reserve these for un-muxing socketcall */
#if
defined(__ARM_EABI__)
/* reserve these for un-muxing socketcall */
#define __NR_socket (__NR_SYSCALL_BASE+281)
#define __NR_bind (__NR_SYSCALL_BASE+282)
#define __NR_connect (__NR_SYSCALL_BASE+283)
...
...
@@ -329,7 +329,7 @@
#define __NR_recvmsg (__NR_SYSCALL_BASE+297)
#endif
#if
0
/* reserve these for un-muxing ipc */
#if
defined(__ARM_EABI__)
/* reserve these for un-muxing ipc */
#define __NR_semop (__NR_SYSCALL_BASE+298)
#define __NR_semget (__NR_SYSCALL_BASE+299)
#define __NR_semctl (__NR_SYSCALL_BASE+300)
...
...
@@ -347,7 +347,7 @@
#define __NR_request_key (__NR_SYSCALL_BASE+310)
#define __NR_keyctl (__NR_SYSCALL_BASE+311)
#if
0
/* reserved for un-muxing ipc */
#if
defined(__ARM_EABI__)
/* reserved for un-muxing ipc */
#define __NR_semtimedop (__NR_SYSCALL_BASE+312)
#endif
...
...
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