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
de5f503c
Commit
de5f503c
authored
Feb 27, 2006
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upstream' of
git://ftp.linux-mips.org/pub/scm/upstream-linus
parents
d904ffd6
2fd628fe
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
58 additions
and
92 deletions
+58
-92
arch/mips/kernel/linux32.c
arch/mips/kernel/linux32.c
+0
-54
arch/mips/kernel/scall64-n32.S
arch/mips/kernel/scall64-n32.S
+1
-1
arch/mips/kernel/scall64-o32.S
arch/mips/kernel/scall64-o32.S
+2
-2
arch/mips/kernel/setup.c
arch/mips/kernel/setup.c
+3
-0
arch/mips/kernel/smp.c
arch/mips/kernel/smp.c
+1
-1
arch/mips/kernel/smp_mt.c
arch/mips/kernel/smp_mt.c
+7
-6
arch/mips/pmc-sierra/yosemite/smp.c
arch/mips/pmc-sierra/yosemite/smp.c
+6
-18
arch/mips/sgi-ip27/ip27-smp.c
arch/mips/sgi-ip27/ip27-smp.c
+6
-1
arch/mips/sibyte/cfe/smp.c
arch/mips/sibyte/cfe/smp.c
+7
-3
include/asm-mips/atomic.h
include/asm-mips/atomic.h
+12
-0
include/asm-mips/smp.h
include/asm-mips/smp.h
+9
-2
include/asm-mips/system.h
include/asm-mips/system.h
+4
-4
No files found.
arch/mips/kernel/linux32.c
View file @
de5f503c
...
...
@@ -161,60 +161,6 @@ out:
return
error
;
}
struct
dirent32
{
unsigned
int
d_ino
;
unsigned
int
d_off
;
unsigned
short
d_reclen
;
char
d_name
[
NAME_MAX
+
1
];
};
static
void
xlate_dirent
(
void
*
dirent64
,
void
*
dirent32
,
long
n
)
{
long
off
;
struct
dirent
*
dirp
;
struct
dirent32
*
dirp32
;
off
=
0
;
while
(
off
<
n
)
{
dirp
=
(
struct
dirent
*
)(
dirent64
+
off
);
dirp32
=
(
struct
dirent32
*
)(
dirent32
+
off
);
off
+=
dirp
->
d_reclen
;
dirp32
->
d_ino
=
dirp
->
d_ino
;
dirp32
->
d_off
=
(
unsigned
int
)
dirp
->
d_off
;
dirp32
->
d_reclen
=
dirp
->
d_reclen
;
strncpy
(
dirp32
->
d_name
,
dirp
->
d_name
,
dirp
->
d_reclen
-
((
3
*
4
)
+
2
));
}
return
;
}
asmlinkage
long
sys32_getdents
(
unsigned
int
fd
,
void
*
dirent32
,
unsigned
int
count
)
{
long
n
;
void
*
dirent64
;
dirent64
=
(
void
*
)((
unsigned
long
)(
dirent32
+
(
sizeof
(
long
)
-
1
))
&
~
(
sizeof
(
long
)
-
1
));
if
((
n
=
sys_getdents
(
fd
,
dirent64
,
count
-
(
dirent64
-
dirent32
)))
<
0
)
return
(
n
);
xlate_dirent
(
dirent64
,
dirent32
,
n
);
return
(
n
);
}
asmlinkage
int
old_readdir
(
unsigned
int
fd
,
void
*
dirent
,
unsigned
int
count
);
asmlinkage
int
sys32_readdir
(
unsigned
int
fd
,
void
*
dirent32
,
unsigned
int
count
)
{
int
n
;
struct
dirent
dirent64
;
if
((
n
=
old_readdir
(
fd
,
&
dirent64
,
count
))
<
0
)
return
(
n
);
xlate_dirent
(
&
dirent64
,
dirent32
,
dirent64
.
d_reclen
);
return
(
n
);
}
asmlinkage
int
sys32_waitpid
(
compat_pid_t
pid
,
unsigned
int
*
stat_addr
,
int
options
)
{
...
...
arch/mips/kernel/scall64-n32.S
View file @
de5f503c
...
...
@@ -195,7 +195,7 @@ EXPORT(sysn32_call_table)
PTR
sys_fdatasync
PTR
sys_truncate
PTR
sys_ftruncate
/*
6075
*/
PTR
sys32
_getdents
PTR
compat_sys
_getdents
PTR
sys_getcwd
PTR
sys_chdir
PTR
sys_fchdir
...
...
arch/mips/kernel/scall64-o32.S
View file @
de5f503c
...
...
@@ -293,7 +293,7 @@ sys_call_table:
PTR
sys_uselib
PTR
sys_swapon
PTR
sys_reboot
PTR
sys32
_readdir
PTR
compat_sys_old
_readdir
PTR
old_mmap
/*
4090
*/
PTR
sys_munmap
PTR
sys_truncate
...
...
@@ -345,7 +345,7 @@ sys_call_table:
PTR
sys_setfsuid
PTR
sys_setfsgid
PTR
sys32_llseek
/*
4140
*/
PTR
sys32
_getdents
PTR
compat_sys
_getdents
PTR
compat_sys_select
PTR
sys_flock
PTR
sys_msync
...
...
arch/mips/kernel/setup.c
View file @
de5f503c
...
...
@@ -540,6 +540,9 @@ void __init setup_arch(char **cmdline_p)
sparse_init
();
paging_init
();
resource_init
();
#ifdef CONFIG_SMP
plat_smp_setup
();
#endif
}
int
__init
fpu_disable
(
char
*
s
)
...
...
arch/mips/kernel/smp.c
View file @
de5f503c
...
...
@@ -236,7 +236,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
init_new_context
(
current
,
&
init_mm
);
current_thread_info
()
->
cpu
=
0
;
smp_tune_scheduling
();
p
rom
_prepare_cpus
(
max_cpus
);
p
lat
_prepare_cpus
(
max_cpus
);
}
/* preload SMP state for boot cpu */
...
...
arch/mips/kernel/smp_mt.c
View file @
de5f503c
...
...
@@ -143,7 +143,7 @@ static struct irqaction irq_call = {
* Make sure all CPU's are in a sensible state before we boot any of the
* secondarys
*/
void
p
rom_prepare_cpus
(
unsigned
int
max_cpus
)
void
p
lat_smp_setup
(
void
)
{
unsigned
long
val
;
int
i
,
num
;
...
...
@@ -179,11 +179,9 @@ void prom_prepare_cpus(unsigned int max_cpus)
write_vpe_c0_vpeconf0
(
tmp
);
/* Record this as available CPU */
if
(
i
<
max_cpus
)
{
cpu_set
(
i
,
phys_cpu_present_map
);
__cpu_number_map
[
i
]
=
++
num
;
__cpu_logical_map
[
num
]
=
i
;
}
cpu_set
(
i
,
phys_cpu_present_map
);
__cpu_number_map
[
i
]
=
++
num
;
__cpu_logical_map
[
num
]
=
i
;
}
/* disable multi-threading with TC's */
...
...
@@ -241,7 +239,10 @@ void prom_prepare_cpus(unsigned int max_cpus)
set_vi_handler
(
MIPS_CPU_IPI_RESCHED_IRQ
,
ipi_resched_dispatch
);
set_vi_handler
(
MIPS_CPU_IPI_CALL_IRQ
,
ipi_call_dispatch
);
}
}
void
__init
plat_prepare_cpus
(
unsigned
int
max_cpus
)
{
cpu_ipi_resched_irq
=
MIPSCPU_INT_BASE
+
MIPS_CPU_IPI_RESCHED_IRQ
;
cpu_ipi_call_irq
=
MIPSCPU_INT_BASE
+
MIPS_CPU_IPI_CALL_IRQ
;
...
...
arch/mips/pmc-sierra/yosemite/smp.c
View file @
de5f503c
...
...
@@ -50,37 +50,25 @@ void __init prom_grab_secondary(void)
* We don't want to start the secondary CPU yet nor do we have a nice probing
* feature in PMON so we just assume presence of the secondary core.
*/
static
char
maxcpus_string
[]
__initdata
=
KERN_WARNING
"max_cpus set to 0; using 1 instead
\n
"
;
void
__init
prom_prepare_cpus
(
unsigned
int
max_cpus
)
void
__init
plat_smp_setup
(
void
)
{
int
enabled
=
0
,
i
;
if
(
max_cpus
==
0
)
{
printk
(
maxcpus_string
);
max_cpus
=
1
;
}
int
i
;
cpus_clear
(
phys_cpu_present_map
);
for
(
i
=
0
;
i
<
2
;
i
++
)
{
if
(
i
==
max_cpus
)
break
;
/*
* The boot CPU
*/
cpu_set
(
i
,
phys_cpu_present_map
);
__cpu_number_map
[
i
]
=
i
;
__cpu_logical_map
[
i
]
=
i
;
enabled
++
;
}
}
void
__init
plat_prepare_cpus
(
unsigned
int
max_cpus
)
{
/*
* Be paranoid. Enable the IPI only if we're really about to go SMP.
*/
if
(
enabled
>
1
)
if
(
cpus_weight
(
cpu_possible_map
)
)
set_c0_status
(
STATUSF_IP5
);
}
...
...
arch/mips/sgi-ip27/ip27-smp.c
View file @
de5f503c
...
...
@@ -140,7 +140,7 @@ static __init void intr_clear_all(nasid_t nasid)
REMOTE_HUB_CLR_INTR
(
nasid
,
i
);
}
void
__init
p
rom_prepare_cpus
(
unsigned
int
max_cpus
)
void
__init
p
lat_smp_setup
(
void
)
{
cnodeid_t
cnode
;
...
...
@@ -161,6 +161,11 @@ void __init prom_prepare_cpus(unsigned int max_cpus)
alloc_cpupda
(
0
,
0
);
}
void
__init
plat_prepare_cpus
(
unsigned
int
max_cpus
)
{
/* We already did everything necessary earlier */
}
/*
* Launch a slave into smp_bootstrap(). It doesn't take an argument, and we
* set sp to the kernel stack of the newly created idle process, gp to the proc
...
...
arch/mips/sibyte/cfe/smp.c
View file @
de5f503c
...
...
@@ -31,7 +31,7 @@
*
* Common setup before any secondaries are started
*/
void
__init
p
rom_prepare_cpus
(
unsigned
int
max_cpus
)
void
__init
p
lat_smp_setup
(
void
)
{
int
i
,
num
;
...
...
@@ -40,14 +40,18 @@ void __init prom_prepare_cpus(unsigned int max_cpus)
__cpu_number_map
[
0
]
=
0
;
__cpu_logical_map
[
0
]
=
0
;
for
(
i
=
1
,
num
=
0
;
i
<
NR_CPUS
;
i
++
)
{
for
(
i
=
1
,
num
=
0
;
i
<
NR_CPUS
;
i
++
)
{
if
(
cfe_cpu_stop
(
i
)
==
0
)
{
cpu_set
(
i
,
phys_cpu_present_map
);
__cpu_number_map
[
i
]
=
++
num
;
__cpu_logical_map
[
num
]
=
i
;
}
}
printk
(
"Detected %i available secondary CPU(s)
\n
"
,
num
);
printk
(
KERN_INFO
"Detected %i available secondary CPU(s)
\n
"
,
num
);
}
void
__init
plat_prepare_cpus
(
unsigned
int
max_cpus
)
{
}
/*
...
...
include/asm-mips/atomic.h
View file @
de5f503c
...
...
@@ -250,7 +250,10 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
" subu %0, %1, %3
\n
"
" bltz %0, 1f
\n
"
" sc %0, %2
\n
"
" .set noreorder
\n
"
" beqzl %0, 1b
\n
"
" subu %0, %1, %3
\n
"
" .set reorder
\n
"
" sync
\n
"
"1:
\n
"
" .set mips0
\n
"
...
...
@@ -266,7 +269,10 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
" subu %0, %1, %3
\n
"
" bltz %0, 1f
\n
"
" sc %0, %2
\n
"
" .set noreorder
\n
"
" beqz %0, 1b
\n
"
" subu %0, %1, %3
\n
"
" .set reorder
\n
"
" sync
\n
"
"1:
\n
"
" .set mips0
\n
"
...
...
@@ -598,7 +604,10 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
" dsubu %0, %1, %3
\n
"
" bltz %0, 1f
\n
"
" scd %0, %2
\n
"
" .set noreorder
\n
"
" beqzl %0, 1b
\n
"
" dsubu %0, %1, %3
\n
"
" .set reorder
\n
"
" sync
\n
"
"1:
\n
"
" .set mips0
\n
"
...
...
@@ -614,7 +623,10 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
" dsubu %0, %1, %3
\n
"
" bltz %0, 1f
\n
"
" scd %0, %2
\n
"
" .set noreorder
\n
"
" beqz %0, 1b
\n
"
" dsubu %0, %1, %3
\n
"
" .set reorder
\n
"
" sync
\n
"
"1:
\n
"
" .set mips0
\n
"
...
...
include/asm-mips/smp.h
View file @
de5f503c
...
...
@@ -58,7 +58,9 @@ static inline int num_booting_cpus(void)
return
cpus_weight
(
cpu_callout_map
);
}
/* These are defined by the board-specific code. */
/*
* These are defined by the board-specific code.
*/
/*
* Cause the function described by call_data to be executed on the passed
...
...
@@ -79,7 +81,12 @@ extern void prom_boot_secondary(int cpu, struct task_struct *idle);
extern
void
prom_init_secondary
(
void
);
/*
* Detect available CPUs, populate phys_cpu_present_map before smp_init
* Populate cpu_possible_map before smp_init, called from setup_arch.
*/
extern
void
plat_smp_setup
(
void
);
/*
* Called after init_IRQ but before __cpu_up.
*/
extern
void
prom_prepare_cpus
(
unsigned
int
max_cpus
);
...
...
include/asm-mips/system.h
View file @
de5f503c
...
...
@@ -322,7 +322,7 @@ static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old,
#endif
"2:
\n
"
" .set pop
\n
"
:
"=&r"
(
retval
),
"=
m
"
(
*
m
)
:
"=&r"
(
retval
),
"=
R
"
(
*
m
)
:
"R"
(
*
m
),
"Jr"
(
old
),
"Jr"
(
new
)
:
"memory"
);
}
else
if
(
cpu_has_llsc
)
{
...
...
@@ -342,7 +342,7 @@ static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old,
#endif
"2:
\n
"
" .set pop
\n
"
:
"=&r"
(
retval
),
"=
m
"
(
*
m
)
:
"=&r"
(
retval
),
"=
R
"
(
*
m
)
:
"R"
(
*
m
),
"Jr"
(
old
),
"Jr"
(
new
)
:
"memory"
);
}
else
{
...
...
@@ -379,7 +379,7 @@ static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old,
#endif
"2:
\n
"
" .set pop
\n
"
:
"=&r"
(
retval
),
"=
m
"
(
*
m
)
:
"=&r"
(
retval
),
"=
R
"
(
*
m
)
:
"R"
(
*
m
),
"Jr"
(
old
),
"Jr"
(
new
)
:
"memory"
);
}
else
if
(
cpu_has_llsc
)
{
...
...
@@ -397,7 +397,7 @@ static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old,
#endif
"2:
\n
"
" .set pop
\n
"
:
"=&r"
(
retval
),
"=
m
"
(
*
m
)
:
"=&r"
(
retval
),
"=
R
"
(
*
m
)
:
"R"
(
*
m
),
"Jr"
(
old
),
"Jr"
(
new
)
:
"memory"
);
}
else
{
...
...
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