Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
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
Commits
5bc159e6
Commit
5bc159e6
authored
Feb 09, 2006
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release' of
git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
parents
ad91e6fa
65b78722
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
46 additions
and
32 deletions
+46
-32
arch/ia64/ia32/ia32_signal.c
arch/ia64/ia32/ia32_signal.c
+1
-0
arch/ia64/kernel/entry.S
arch/ia64/kernel/entry.S
+16
-0
arch/ia64/kernel/fsys.S
arch/ia64/kernel/fsys.S
+3
-26
arch/ia64/kernel/mca_drv.c
arch/ia64/kernel/mca_drv.c
+3
-0
arch/ia64/sn/kernel/io_init.c
arch/ia64/sn/kernel/io_init.c
+4
-4
arch/ia64/sn/kernel/irq.c
arch/ia64/sn/kernel/irq.c
+3
-1
include/asm-ia64/unistd.h
include/asm-ia64/unistd.h
+16
-1
No files found.
arch/ia64/ia32/ia32_signal.c
View file @
5bc159e6
...
...
@@ -515,6 +515,7 @@ sys32_signal (int sig, unsigned int handler)
sigact_set_handler
(
&
new_sa
,
handler
,
0
);
new_sa
.
sa
.
sa_flags
=
SA_ONESHOT
|
SA_NOMASK
;
sigemptyset
(
&
new_sa
.
sa
.
sa_mask
);
ret
=
do_sigaction
(
sig
,
&
new_sa
,
&
old_sa
);
...
...
arch/ia64/kernel/entry.S
View file @
5bc159e6
...
...
@@ -1601,5 +1601,21 @@ sys_call_table:
data8
sys_inotify_add_watch
data8
sys_inotify_rm_watch
data8
sys_migrate_pages
//
1280
data8
sys_openat
data8
sys_mkdirat
data8
sys_mknodat
data8
sys_fchownat
data8
sys_futimesat
//
1285
data8
sys_newfstatat
data8
sys_unlinkat
data8
sys_renameat
data8
sys_linkat
data8
sys_symlinkat
//
1290
data8
sys_readlinkat
data8
sys_fchmodat
data8
sys_faccessat
data8
sys_ni_syscall
//
reserved
for
pselect
data8
sys_ni_syscall
//
1295
reserved
for
ppoll
data8
sys_unshare
.
org
sys_call_table
+
8
*
NR_syscalls
//
guard
against
failures
to
increase
NR_syscalls
arch/ia64/kernel/fsys.S
View file @
5bc159e6
...
...
@@ -878,31 +878,8 @@ fsyscall_table:
data8
0
//
timer_delete
data8
0
//
clock_settime
data8
fsys_clock_gettime
//
clock_gettime
data8
0
//
clock_getres
//
1255
data8
0
//
clock_nanosleep
data8
0
//
fstatfs64
data8
0
//
statfs64
data8
0
data8
0
//
1260
data8
0
data8
0
//
mq_open
data8
0
//
mq_unlink
data8
0
//
mq_timedsend
data8
0
//
mq_timedreceive
//
1265
data8
0
//
mq_notify
data8
0
//
mq_getsetattr
data8
0
//
kexec_load
data8
0
data8
0
//
1270
data8
0
data8
0
data8
0
data8
0
data8
0
//
1275
data8
0
data8
0
data8
0
data8
0
data8
0
//
1280
#define __NR_syscall_last 1255
.
space
8
*(
NR_syscalls
+
1024
-
__NR_syscall_last
),
0
.
org
fsyscall_table
+
8
*
NR_syscalls
//
guard
against
failures
to
increase
NR_syscalls
arch/ia64/kernel/mca_drv.c
View file @
5bc159e6
...
...
@@ -437,6 +437,9 @@ recover_from_read_error(slidx_table_t *slidx,
* the process not have any locks of kernel.
*/
/* Is minstate valid? */
if
(
!
peidx_bottom
(
peidx
)
||
!
(
peidx_bottom
(
peidx
)
->
valid
.
minstate
))
return
0
;
psr1
=
(
struct
ia64_psr
*
)
&
(
peidx_minstate_area
(
peidx
)
->
pmsa_ipsr
);
/*
...
...
arch/ia64/sn/kernel/io_init.c
View file @
5bc159e6
...
...
@@ -617,15 +617,15 @@ void sn_bus_store_sysdata(struct pci_dev *dev)
void
sn_bus_free_sysdata
(
void
)
{
struct
sysdata_el
*
element
;
struct
list_head
*
list
;
struct
list_head
*
list
,
*
safe
;
sn_sysdata_free_start:
list_for_each
(
list
,
&
sn_sysdata_list
)
{
list_for_each_safe
(
list
,
safe
,
&
sn_sysdata_list
)
{
element
=
list_entry
(
list
,
struct
sysdata_el
,
entry
);
list_del
(
&
element
->
entry
);
list_del
(
&
(((
struct
pcidev_info
*
)
(
element
->
sysdata
))
->
pdi_list
));
kfree
(
element
->
sysdata
);
kfree
(
element
);
goto
sn_sysdata_free_start
;
}
return
;
}
...
...
arch/ia64/sn/kernel/irq.c
View file @
5bc159e6
...
...
@@ -299,7 +299,9 @@ void sn_irq_unfixup(struct pci_dev *pci_dev)
return
;
sn_irq_info
=
SN_PCIDEV_INFO
(
pci_dev
)
->
pdi_sn_irq_info
;
if
(
!
sn_irq_info
||
!
sn_irq_info
->
irq_irq
)
{
if
(
!
sn_irq_info
)
return
;
if
(
!
sn_irq_info
->
irq_irq
)
{
kfree
(
sn_irq_info
);
return
;
}
...
...
include/asm-ia64/unistd.h
View file @
5bc159e6
...
...
@@ -270,12 +270,27 @@
#define __NR_inotify_add_watch 1278
#define __NR_inotify_rm_watch 1279
#define __NR_migrate_pages 1280
#define __NR_openat 1281
#define __NR_mkdirat 1282
#define __NR_mknodat 1283
#define __NR_fchownat 1284
#define __NR_futimesat 1285
#define __NR_newfstatat 1286
#define __NR_unlinkat 1287
#define __NR_renameat 1288
#define __NR_linkat 1289
#define __NR_symlinkat 1290
#define __NR_readlinkat 1291
#define __NR_fchmodat 1292
#define __NR_faccessat 1293
/* 1294, 1295 reserved for pselect/ppoll */
#define __NR_unshare 1296
#ifdef __KERNEL__
#include <linux/config.h>
#define NR_syscalls 27
0
/* length of syscall table */
#define NR_syscalls 27
3
/* length of syscall table */
#define __ARCH_WANT_SYS_RT_SIGACTION
...
...
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