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
7974b1cc
Commit
7974b1cc
authored
Aug 17, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/rmk/linux-2.6-arm
parents
c4f92dba
62ee914e
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
28 deletions
+25
-28
arch/arm/kernel/calls.S
arch/arm/kernel/calls.S
+6
-0
arch/arm/mach-s3c2410/s3c2410.c
arch/arm/mach-s3c2410/s3c2410.c
+2
-2
arch/arm/mm/Kconfig
arch/arm/mm/Kconfig
+1
-1
arch/arm/mm/proc-v6.S
arch/arm/mm/proc-v6.S
+1
-1
arch/arm/nwfpe/softfloat.c
arch/arm/nwfpe/softfloat.c
+10
-24
include/asm-arm/unistd.h
include/asm-arm/unistd.h
+5
-0
No files found.
arch/arm/kernel/calls.S
View file @
7974b1cc
...
...
@@ -327,6 +327,12 @@ __syscall_start:
/*
310
*/
.
long
sys_request_key
.
long
sys_keyctl
.
long
sys_semtimedop
/*
vserver
*/
.
long
sys_ni_syscall
.
long
sys_ioprio_set
/*
315
*/
.
long
sys_ioprio_get
.
long
sys_inotify_init
.
long
sys_inotify_add_watch
.
long
sys_inotify_rm_watch
__syscall_end
:
.
rept
NR_syscalls
-
(
__syscall_end
-
__syscall_start
)
/
4
...
...
arch/arm/mach-s3c2410/s3c2410.c
View file @
7974b1cc
...
...
@@ -18,6 +18,7 @@
* 28-Sep-2004 BJD Updates for new serial port bits
* 04-Nov-2004 BJD Updated UART configuration process
* 10-Jan-2005 BJD Removed s3c2410_clock_tick_rate
* 13-Aug-2005 DA Removed UART from initial I/O mappings
*/
#include <linux/kernel.h>
...
...
@@ -49,10 +50,9 @@ static struct map_desc s3c2410_iodesc[] __initdata = {
IODESC_ENT
(
USBHOST
),
IODESC_ENT
(
CLKPWR
),
IODESC_ENT
(
LCD
),
IODESC_ENT
(
UART
),
IODESC_ENT
(
TIMER
),
IODESC_ENT
(
ADC
),
IODESC_ENT
(
WATCHDOG
)
IODESC_ENT
(
WATCHDOG
)
,
};
static
struct
resource
s3c_uart0_resource
[]
=
{
...
...
arch/arm/mm/Kconfig
View file @
7974b1cc
...
...
@@ -384,7 +384,7 @@ config CPU_DCACHE_DISABLE
config CPU_DCACHE_WRITETHROUGH
bool "Force write through D-cache"
depends on (CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020) && !CPU_D
ISABLE_DCACH
E
depends on (CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020) && !CPU_D
CACHE_DISABL
E
default y if CPU_ARM925T
help
Say Y here to use the data cache in writethrough mode. Unless you
...
...
arch/arm/mm/proc-v6.S
View file @
7974b1cc
arch/arm/nwfpe/softfloat.c
View file @
7974b1cc
...
...
@@ -1602,9 +1602,7 @@ flag float32_le_quiet( float32 a, float32 b )
if
(
(
(
extractFloat32Exp
(
a
)
==
0xFF
)
&&
extractFloat32Frac
(
a
)
)
||
(
(
extractFloat32Exp
(
b
)
==
0xFF
)
&&
extractFloat32Frac
(
b
)
)
)
{
if
(
float32_is_signaling_nan
(
a
)
||
float32_is_signaling_nan
(
b
)
)
{
float_raise
(
float_flag_invalid
);
}
/* Do nothing, even if NaN as we're quiet */
return
0
;
}
aSign
=
extractFloat32Sign
(
a
);
...
...
@@ -1629,9 +1627,7 @@ flag float32_lt_quiet( float32 a, float32 b )
if
(
(
(
extractFloat32Exp
(
a
)
==
0xFF
)
&&
extractFloat32Frac
(
a
)
)
||
(
(
extractFloat32Exp
(
b
)
==
0xFF
)
&&
extractFloat32Frac
(
b
)
)
)
{
if
(
float32_is_signaling_nan
(
a
)
||
float32_is_signaling_nan
(
b
)
)
{
float_raise
(
float_flag_invalid
);
}
/* Do nothing, even if NaN as we're quiet */
return
0
;
}
aSign
=
extractFloat32Sign
(
a
);
...
...
@@ -2493,9 +2489,7 @@ flag float64_le_quiet( float64 a, float64 b )
if
(
(
(
extractFloat64Exp
(
a
)
==
0x7FF
)
&&
extractFloat64Frac
(
a
)
)
||
(
(
extractFloat64Exp
(
b
)
==
0x7FF
)
&&
extractFloat64Frac
(
b
)
)
)
{
if
(
float64_is_signaling_nan
(
a
)
||
float64_is_signaling_nan
(
b
)
)
{
float_raise
(
float_flag_invalid
);
}
/* Do nothing, even if NaN as we're quiet */
return
0
;
}
aSign
=
extractFloat64Sign
(
a
);
...
...
@@ -2520,9 +2514,7 @@ flag float64_lt_quiet( float64 a, float64 b )
if
(
(
(
extractFloat64Exp
(
a
)
==
0x7FF
)
&&
extractFloat64Frac
(
a
)
)
||
(
(
extractFloat64Exp
(
b
)
==
0x7FF
)
&&
extractFloat64Frac
(
b
)
)
)
{
if
(
float64_is_signaling_nan
(
a
)
||
float64_is_signaling_nan
(
b
)
)
{
float_raise
(
float_flag_invalid
);
}
/* Do nothing, even if NaN as we're quiet */
return
0
;
}
aSign
=
extractFloat64Sign
(
a
);
...
...
@@ -3256,7 +3248,7 @@ flag floatx80_eq( floatx80 a, floatx80 b )
)
{
if
(
floatx80_is_signaling_nan
(
a
)
||
floatx80_is_signaling_nan
(
b
)
)
{
roundData
->
exception
|=
float_flag_invalid
;
float_raise
(
float_flag_invalid
)
;
}
return
0
;
}
...
...
@@ -3286,7 +3278,7 @@ flag floatx80_le( floatx80 a, floatx80 b )
||
(
(
extractFloatx80Exp
(
b
)
==
0x7FFF
)
&&
(
bits64
)
(
extractFloatx80Frac
(
b
)
<<
1
)
)
)
{
roundData
->
exception
|=
float_flag_invalid
;
float_raise
(
float_flag_invalid
)
;
return
0
;
}
aSign
=
extractFloatx80Sign
(
a
);
...
...
@@ -3320,7 +3312,7 @@ flag floatx80_lt( floatx80 a, floatx80 b )
||
(
(
extractFloatx80Exp
(
b
)
==
0x7FFF
)
&&
(
bits64
)
(
extractFloatx80Frac
(
b
)
<<
1
)
)
)
{
roundData
->
exception
|=
float_flag_invalid
;
float_raise
(
float_flag_invalid
)
;
return
0
;
}
aSign
=
extractFloatx80Sign
(
a
);
...
...
@@ -3353,7 +3345,7 @@ flag floatx80_eq_signaling( floatx80 a, floatx80 b )
||
(
(
extractFloatx80Exp
(
b
)
==
0x7FFF
)
&&
(
bits64
)
(
extractFloatx80Frac
(
b
)
<<
1
)
)
)
{
roundData
->
exception
|=
float_flag_invalid
;
float_raise
(
float_flag_invalid
)
;
return
0
;
}
return
...
...
@@ -3382,10 +3374,7 @@ flag floatx80_le_quiet( floatx80 a, floatx80 b )
||
(
(
extractFloatx80Exp
(
b
)
==
0x7FFF
)
&&
(
bits64
)
(
extractFloatx80Frac
(
b
)
<<
1
)
)
)
{
if
(
floatx80_is_signaling_nan
(
a
)
||
floatx80_is_signaling_nan
(
b
)
)
{
roundData
->
exception
|=
float_flag_invalid
;
}
/* Do nothing, even if NaN as we're quiet */
return
0
;
}
aSign
=
extractFloatx80Sign
(
a
);
...
...
@@ -3419,10 +3408,7 @@ flag floatx80_lt_quiet( floatx80 a, floatx80 b )
||
(
(
extractFloatx80Exp
(
b
)
==
0x7FFF
)
&&
(
bits64
)
(
extractFloatx80Frac
(
b
)
<<
1
)
)
)
{
if
(
floatx80_is_signaling_nan
(
a
)
||
floatx80_is_signaling_nan
(
b
)
)
{
roundData
->
exception
|=
float_flag_invalid
;
}
/* Do nothing, even if NaN as we're quiet */
return
0
;
}
aSign
=
extractFloatx80Sign
(
a
);
...
...
include/asm-arm/unistd.h
View file @
7974b1cc
...
...
@@ -350,6 +350,11 @@
#endif
#define __NR_vserver (__NR_SYSCALL_BASE+313)
#define __NR_ioprio_set (__NR_SYSCALL_BASE+314)
#define __NR_ioprio_get (__NR_SYSCALL_BASE+315)
#define __NR_inotify_init (__NR_SYSCALL_BASE+316)
#define __NR_inotify_add_watch (__NR_SYSCALL_BASE+317)
#define __NR_inotify_rm_watch (__NR_SYSCALL_BASE+318)
/*
* The following SWIs are ARM private.
...
...
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