diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-09 20:08:09 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-09 20:08:09 -0500 |
commit | 5bc159e6cb7ca8d173195919ee935885c129011e (patch) | |
tree | 664360df9314d9c338a089da52bb3f2b97d5cdba /arch | |
parent | ad91e6fa0d331e419e4692d146cdc04e594a5bea (diff) | |
parent | 65b78722ce2a2dc76108b467f79b2c5b4864af82 (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/ia32/ia32_signal.c | 1 | ||||
-rw-r--r-- | arch/ia64/kernel/entry.S | 16 | ||||
-rw-r--r-- | arch/ia64/kernel/fsys.S | 29 | ||||
-rw-r--r-- | arch/ia64/kernel/mca_drv.c | 3 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/io_init.c | 8 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/irq.c | 4 |
6 files changed, 30 insertions, 31 deletions
diff --git a/arch/ia64/ia32/ia32_signal.c b/arch/ia64/ia32/ia32_signal.c index 5856510210fa..b3355a9ca2c3 100644 --- a/arch/ia64/ia32/ia32_signal.c +++ b/arch/ia64/ia32/ia32_signal.c | |||
@@ -515,6 +515,7 @@ sys32_signal (int sig, unsigned int handler) | |||
515 | 515 | ||
516 | sigact_set_handler(&new_sa, handler, 0); | 516 | sigact_set_handler(&new_sa, handler, 0); |
517 | new_sa.sa.sa_flags = SA_ONESHOT | SA_NOMASK; | 517 | new_sa.sa.sa_flags = SA_ONESHOT | SA_NOMASK; |
518 | sigemptyset(&new_sa.sa.sa_mask); | ||
518 | 519 | ||
519 | ret = do_sigaction(sig, &new_sa, &old_sa); | 520 | ret = do_sigaction(sig, &new_sa, &old_sa); |
520 | 521 | ||
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 7a6ffd613789..27b222c277e4 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
@@ -1601,5 +1601,21 @@ sys_call_table: | |||
1601 | data8 sys_inotify_add_watch | 1601 | data8 sys_inotify_add_watch |
1602 | data8 sys_inotify_rm_watch | 1602 | data8 sys_inotify_rm_watch |
1603 | data8 sys_migrate_pages // 1280 | 1603 | data8 sys_migrate_pages // 1280 |
1604 | data8 sys_openat | ||
1605 | data8 sys_mkdirat | ||
1606 | data8 sys_mknodat | ||
1607 | data8 sys_fchownat | ||
1608 | data8 sys_futimesat // 1285 | ||
1609 | data8 sys_newfstatat | ||
1610 | data8 sys_unlinkat | ||
1611 | data8 sys_renameat | ||
1612 | data8 sys_linkat | ||
1613 | data8 sys_symlinkat // 1290 | ||
1614 | data8 sys_readlinkat | ||
1615 | data8 sys_fchmodat | ||
1616 | data8 sys_faccessat | ||
1617 | data8 sys_ni_syscall // reserved for pselect | ||
1618 | data8 sys_ni_syscall // 1295 reserved for ppoll | ||
1619 | data8 sys_unshare | ||
1604 | 1620 | ||
1605 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls | 1621 | .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls |
diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S index ce423910ca97..ac6055c83115 100644 --- a/arch/ia64/kernel/fsys.S +++ b/arch/ia64/kernel/fsys.S | |||
@@ -878,31 +878,8 @@ fsyscall_table: | |||
878 | data8 0 // timer_delete | 878 | data8 0 // timer_delete |
879 | data8 0 // clock_settime | 879 | data8 0 // clock_settime |
880 | data8 fsys_clock_gettime // clock_gettime | 880 | data8 fsys_clock_gettime // clock_gettime |
881 | data8 0 // clock_getres // 1255 | 881 | #define __NR_syscall_last 1255 |
882 | data8 0 // clock_nanosleep | 882 | |
883 | data8 0 // fstatfs64 | 883 | .space 8*(NR_syscalls + 1024 - __NR_syscall_last), 0 |
884 | data8 0 // statfs64 | ||
885 | data8 0 | ||
886 | data8 0 // 1260 | ||
887 | data8 0 | ||
888 | data8 0 // mq_open | ||
889 | data8 0 // mq_unlink | ||
890 | data8 0 // mq_timedsend | ||
891 | data8 0 // mq_timedreceive // 1265 | ||
892 | data8 0 // mq_notify | ||
893 | data8 0 // mq_getsetattr | ||
894 | data8 0 // kexec_load | ||
895 | data8 0 | ||
896 | data8 0 // 1270 | ||
897 | data8 0 | ||
898 | data8 0 | ||
899 | data8 0 | ||
900 | data8 0 | ||
901 | data8 0 // 1275 | ||
902 | data8 0 | ||
903 | data8 0 | ||
904 | data8 0 | ||
905 | data8 0 | ||
906 | data8 0 // 1280 | ||
907 | 884 | ||
908 | .org fsyscall_table + 8*NR_syscalls // guard against failures to increase NR_syscalls | 885 | .org fsyscall_table + 8*NR_syscalls // guard against failures to increase NR_syscalls |
diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c index 3492e3211a44..8fd93afa75a7 100644 --- a/arch/ia64/kernel/mca_drv.c +++ b/arch/ia64/kernel/mca_drv.c | |||
@@ -437,6 +437,9 @@ recover_from_read_error(slidx_table_t *slidx, | |||
437 | * the process not have any locks of kernel. | 437 | * the process not have any locks of kernel. |
438 | */ | 438 | */ |
439 | 439 | ||
440 | /* Is minstate valid? */ | ||
441 | if (!peidx_bottom(peidx) || !(peidx_bottom(peidx)->valid.minstate)) | ||
442 | return 0; | ||
440 | psr1 =(struct ia64_psr *)&(peidx_minstate_area(peidx)->pmsa_ipsr); | 443 | psr1 =(struct ia64_psr *)&(peidx_minstate_area(peidx)->pmsa_ipsr); |
441 | 444 | ||
442 | /* | 445 | /* |
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c index d7e4d79e16a8..3437c2390429 100644 --- a/arch/ia64/sn/kernel/io_init.c +++ b/arch/ia64/sn/kernel/io_init.c | |||
@@ -617,15 +617,15 @@ void sn_bus_store_sysdata(struct pci_dev *dev) | |||
617 | void sn_bus_free_sysdata(void) | 617 | void sn_bus_free_sysdata(void) |
618 | { | 618 | { |
619 | struct sysdata_el *element; | 619 | struct sysdata_el *element; |
620 | struct list_head *list; | 620 | struct list_head *list, *safe; |
621 | 621 | ||
622 | sn_sysdata_free_start: | 622 | list_for_each_safe(list, safe, &sn_sysdata_list) { |
623 | list_for_each(list, &sn_sysdata_list) { | ||
624 | element = list_entry(list, struct sysdata_el, entry); | 623 | element = list_entry(list, struct sysdata_el, entry); |
625 | list_del(&element->entry); | 624 | list_del(&element->entry); |
625 | list_del(&(((struct pcidev_info *) | ||
626 | (element->sysdata))->pdi_list)); | ||
626 | kfree(element->sysdata); | 627 | kfree(element->sysdata); |
627 | kfree(element); | 628 | kfree(element); |
628 | goto sn_sysdata_free_start; | ||
629 | } | 629 | } |
630 | return; | 630 | return; |
631 | } | 631 | } |
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index 74d87d903d5d..c373113d073a 100644 --- a/arch/ia64/sn/kernel/irq.c +++ b/arch/ia64/sn/kernel/irq.c | |||
@@ -299,7 +299,9 @@ void sn_irq_unfixup(struct pci_dev *pci_dev) | |||
299 | return; | 299 | return; |
300 | 300 | ||
301 | sn_irq_info = SN_PCIDEV_INFO(pci_dev)->pdi_sn_irq_info; | 301 | sn_irq_info = SN_PCIDEV_INFO(pci_dev)->pdi_sn_irq_info; |
302 | if (!sn_irq_info || !sn_irq_info->irq_irq) { | 302 | if (!sn_irq_info) |
303 | return; | ||
304 | if (!sn_irq_info->irq_irq) { | ||
303 | kfree(sn_irq_info); | 305 | kfree(sn_irq_info); |
304 | return; | 306 | return; |
305 | } | 307 | } |