Commit 3da9cf28 authored by Linus Torvalds's avatar Linus Torvalds

Merge penguin:v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 7f9efd7d 8a9b07a2
...@@ -2779,6 +2779,10 @@ N: Christopher Smith ...@@ -2779,6 +2779,10 @@ N: Christopher Smith
E: x@xman.org E: x@xman.org
D: Tulip net driver hacker D: Tulip net driver hacker
N: Mark Smith
E: mark.smith@comdev.cc
D: Multicast support in bonding driver
N: Miquel van Smoorenburg N: Miquel van Smoorenburg
E: miquels@cistron.nl E: miquels@cistron.nl
D: Kernel and net hacker. Sysvinit, minicom. doing Debian stuff. D: Kernel and net hacker. Sysvinit, minicom. doing Debian stuff.
......
...@@ -22,8 +22,8 @@ extern void cpu_probe(void); ...@@ -22,8 +22,8 @@ extern void cpu_probe(void);
extern void clock_stop_probe(void); /* tadpole.c */ extern void clock_stop_probe(void); /* tadpole.c */
extern void sun4c_probe_memerr_reg(void); extern void sun4c_probe_memerr_reg(void);
unsigned long __init void __init
device_scan(unsigned long mem_start) device_scan(void)
{ {
char node_str[128]; char node_str[128];
int thismid; int thismid;
...@@ -37,46 +37,45 @@ device_scan(unsigned long mem_start) ...@@ -37,46 +37,45 @@ device_scan(unsigned long mem_start)
int scan; int scan;
scan = prom_getchild(prom_root_node); scan = prom_getchild(prom_root_node);
/* One can look it up in PROM instead */ /* One can look it up in PROM instead */
/* prom_printf("root child is %08lx\n", (unsigned long) scan); */ while ((scan = prom_getsibling(scan)) != 0) {
while((scan = prom_getsibling(scan)) != 0) { prom_getstring(scan, "device_type",
prom_getstring(scan, "device_type", node_str, sizeof(node_str)); node_str, sizeof(node_str));
if(strcmp(node_str, "cpu") == 0) { if (strcmp(node_str, "cpu") == 0) {
linux_cpus[linux_num_cpus].prom_node = scan; linux_cpus[linux_num_cpus].prom_node = scan;
prom_getproperty(scan, "mid", (char *) &thismid, sizeof(thismid)); prom_getproperty(scan, "mid",
(char *) &thismid, sizeof(thismid));
linux_cpus[linux_num_cpus].mid = thismid; linux_cpus[linux_num_cpus].mid = thismid;
/* prom_printf("Found CPU %d <node=%08lx,mid=%d>\n", linux_num_cpus, (unsigned long) scan, thismid); */ printk("Found CPU %d <node=%08lx,mid=%d>\n",
printk("Found CPU %d <node=%08lx,mid=%d>\n", linux_num_cpus, (unsigned long) scan, thismid); linux_num_cpus, (unsigned long) scan, thismid);
linux_num_cpus++; linux_num_cpus++;
} }
} }
if(linux_num_cpus == 0) { if (linux_num_cpus == 0 && sparc_cpu_model == sun4d) {
if (sparc_cpu_model == sun4d) { scan = prom_getchild(prom_root_node);
scan = prom_getchild(prom_root_node); for (scan = prom_searchsiblings(scan, "cpu-unit"); scan;
for (scan = prom_searchsiblings(scan, "cpu-unit"); scan; scan = prom_searchsiblings(prom_getsibling(scan), "cpu-unit")) {
scan = prom_searchsiblings(prom_getsibling(scan), "cpu-unit")) { int node = prom_getchild(scan);
int node = prom_getchild(scan);
prom_getstring(node, "device_type", node_str, sizeof(node_str)); prom_getstring(node, "device_type",
if (strcmp(node_str, "cpu") == 0) { node_str, sizeof(node_str));
prom_getproperty(node, "cpu-id", (char *) &thismid, sizeof(thismid)); if (strcmp(node_str, "cpu") == 0) {
linux_cpus[linux_num_cpus].prom_node = node; prom_getproperty(node, "cpu-id",
linux_cpus[linux_num_cpus].mid = thismid; (char *) &thismid, sizeof(thismid));
/* prom_printf("Found CPU %d <node=%08lx,mid=%d>\n", linux_cpus[linux_num_cpus].prom_node = node;
linux_num_cpus, (unsigned long) node, thismid); */ linux_cpus[linux_num_cpus].mid = thismid;
printk("Found CPU %d <node=%08lx,mid=%d>\n", printk("Found CPU %d <node=%08lx,mid=%d>\n",
linux_num_cpus, (unsigned long) node, thismid); linux_num_cpus, (unsigned long) node, thismid);
linux_num_cpus++; linux_num_cpus++;
}
} }
} }
} }
if(linux_num_cpus == 0) { if (linux_num_cpus == 0) {
printk("No CPU nodes found, cannot continue.\n"); printk("No CPU nodes found, cannot continue.\n");
/* Probably a sun4e, Sun is trying to trick us ;-) */ /* Probably a sun4e, Sun is trying to trick us ;-) */
halt(); halt();
} }
printk("Found %d CPU prom device tree node(s).\n", linux_num_cpus); printk("Found %d CPU prom device tree node(s).\n", linux_num_cpus);
}; }
cpu_probe(); cpu_probe();
#ifdef CONFIG_SUN_AUXIO #ifdef CONFIG_SUN_AUXIO
...@@ -92,5 +91,5 @@ device_scan(unsigned long mem_start) ...@@ -92,5 +91,5 @@ device_scan(unsigned long mem_start)
if (ARCH_SUN4C_SUN4) if (ARCH_SUN4C_SUN4)
sun4c_probe_memerr_reg(); sun4c_probe_memerr_reg();
return mem_start; return;
} }
This diff is collapsed.
...@@ -31,11 +31,6 @@ else ...@@ -31,11 +31,6 @@ else
endif endif
endif endif
#
# This is just to get the dependencies...
#
binfmt_elf32.o: $(TOPDIR)/fs/binfmt_elf.c
ifneq ($(NEW_GCC),y) ifneq ($(NEW_GCC),y)
CMODEL_CFLAG := -mmedlow CMODEL_CFLAG := -mmedlow
else else
......
...@@ -2879,16 +2879,19 @@ do_execve32(char * filename, u32 * argv, u32 * envp, struct pt_regs * regs) ...@@ -2879,16 +2879,19 @@ do_execve32(char * filename, u32 * argv, u32 * envp, struct pt_regs * regs)
bprm.sh_bang = 0; bprm.sh_bang = 0;
bprm.loader = 0; bprm.loader = 0;
bprm.exec = 0; bprm.exec = 0;
if ((bprm.argc = count32(argv, bprm.p / sizeof(u32))) < 0) {
allow_write_access(file); bprm.mm = mm_alloc();
fput(file); retval = -ENOMEM;
return bprm.argc; if (!bprm.mm)
} goto out_file;
if ((bprm.envc = count32(envp, bprm.p / sizeof(u32))) < 0) {
allow_write_access(file); bprm.argc = count32(argv, bprm.p / sizeof(u32));
fput(file); if ((retval = bprm.argc) < 0)
return bprm.envc; goto out_mm;
}
bprm.envc = count32(envp, bprm.p / sizeof(u32));
if ((retval = bprm.envc) < 0)
goto out_mm;
retval = prepare_binprm(&bprm); retval = prepare_binprm(&bprm);
if (retval < 0) if (retval < 0)
...@@ -2914,14 +2917,20 @@ do_execve32(char * filename, u32 * argv, u32 * envp, struct pt_regs * regs) ...@@ -2914,14 +2917,20 @@ do_execve32(char * filename, u32 * argv, u32 * envp, struct pt_regs * regs)
out: out:
/* Something went wrong, return the inode and free the argument pages*/ /* Something went wrong, return the inode and free the argument pages*/
allow_write_access(bprm.file); for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
if (bprm.file) struct page * page = bprm.page[i];
fput(bprm.file); if (page)
__free_page(page);
}
for (i=0 ; i<MAX_ARG_PAGES ; i++) out_mm:
if (bprm.page[i]) mmdrop(bprm.mm);
__free_page(bprm.page[i]);
out_file:
if (bprm.file) {
allow_write_access(bprm.file);
fput(bprm.file);
}
return retval; return retval;
} }
......
...@@ -17,20 +17,10 @@ ...@@ -17,20 +17,10 @@
static inline void forget_pte(pte_t page) static inline void forget_pte(pte_t page)
{ {
if (pte_none(page)) if (!pte_none(page)) {
return; printk("forget_pte: old mapping existed!\n");
if (pte_present(page)) { BUG();
unsigned long pfn = pte_pfn(page);
struct page *ptpage;
if (!pfn_valid(pfn))
return;
ptpage = pfn_to_page(page);
if (PageReserved(ptpage))
return;
page_cache_release(ptpage);
return;
} }
swap_free(pte_to_swp_entry(page));
} }
/* Remap IO memory, the same way as remap_page_range(), but use /* Remap IO memory, the same way as remap_page_range(), but use
......
...@@ -44,6 +44,6 @@ static int sys_bus_init(void) ...@@ -44,6 +44,6 @@ static int sys_bus_init(void)
return device_register(&system_bus); return device_register(&system_bus);
} }
subsys_initcall(sys_bus_init); postcore_initcall(sys_bus_init);
EXPORT_SYMBOL(register_sys_device); EXPORT_SYMBOL(register_sys_device);
EXPORT_SYMBOL(unregister_sys_device); EXPORT_SYMBOL(unregister_sys_device);
...@@ -1069,7 +1069,9 @@ static void idedisk_setup(struct ata_device *drive) ...@@ -1069,7 +1069,9 @@ static void idedisk_setup(struct ata_device *drive)
} }
#else #else
printk("%s: setmax_ext LBA %llu, native %llu\n", printk("%s: setmax_ext LBA %llu, native %llu\n",
drive->name, set_max_ext, capacity_2); drive->name,
(long long) set_max_ext,
(long long) capacity_2);
#endif #endif
} }
drive->bios_cyl = drive->cyl; drive->bios_cyl = drive->cyl;
......
...@@ -451,7 +451,7 @@ static void __init setup_pci_device(struct pci_dev *dev, struct ata_pci_device * ...@@ -451,7 +451,7 @@ static void __init setup_pci_device(struct pci_dev *dev, struct ata_pci_device *
if (d->init_chipset) if (d->init_chipset)
d->init_chipset(dev); d->init_chipset(dev);
#ifdef __sparc__ #ifdef __sparc__
printk(KERN_INFO "ATA: 100%% native mode on irq\n", __irq_itoa(pciirq)); printk(KERN_INFO "ATA: 100%% native mode on irq %s\n", __irq_itoa(pciirq));
#else #else
printk(KERN_INFO "ATA: 100%% native mode on irq %d\n", pciirq); printk(KERN_INFO "ATA: 100%% native mode on irq %d\n", pciirq);
#endif #endif
......
...@@ -875,7 +875,8 @@ static void channel_probe(struct ata_channel *ch) ...@@ -875,7 +875,8 @@ static void channel_probe(struct ata_channel *ch)
/* Register this hardware interface within the global device tree. /* Register this hardware interface within the global device tree.
*/ */
sprintf(ch->dev.bus_id, "%04x", ch->io_ports[IDE_DATA_OFFSET]); sprintf(ch->dev.bus_id, "%04lx",
(unsigned long) ch->io_ports[IDE_DATA_OFFSET]);
sprintf(ch->dev.name, "ide"); sprintf(ch->dev.name, "ide");
ch->dev.driver_data = ch; ch->dev.driver_data = ch;
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
......
This diff is collapsed.
...@@ -204,7 +204,7 @@ static int __init pci_driver_init(void) ...@@ -204,7 +204,7 @@ static int __init pci_driver_init(void)
return bus_register(&pci_bus_type); return bus_register(&pci_bus_type);
} }
subsys_initcall(pci_driver_init); postcore_initcall(pci_driver_init);
EXPORT_SYMBOL(pci_match_device); EXPORT_SYMBOL(pci_match_device);
EXPORT_SYMBOL(pci_register_driver); EXPORT_SYMBOL(pci_register_driver);
......
...@@ -126,6 +126,10 @@ ...@@ -126,6 +126,10 @@
#include <asm/semaphore.h> #include <asm/semaphore.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#define IS_POSIX(fl) (fl->fl_flags & FL_POSIX)
#define IS_FLOCK(fl) (fl->fl_flags & FL_FLOCK)
#define IS_LEASE(fl) (fl->fl_flags & FL_LEASE)
int leases_enable = 1; int leases_enable = 1;
int lease_break_time = 45; int lease_break_time = 45;
...@@ -561,8 +565,7 @@ static int posix_locks_conflict(struct file_lock *caller_fl, struct file_lock *s ...@@ -561,8 +565,7 @@ static int posix_locks_conflict(struct file_lock *caller_fl, struct file_lock *s
/* POSIX locks owned by the same process do not conflict with /* POSIX locks owned by the same process do not conflict with
* each other. * each other.
*/ */
if (!(sys_fl->fl_flags & FL_POSIX) || if (!IS_POSIX(sys_fl) || locks_same_owner(caller_fl, sys_fl))
locks_same_owner(caller_fl, sys_fl))
return (0); return (0);
/* Check whether they overlap */ /* Check whether they overlap */
...@@ -580,8 +583,7 @@ static int flock_locks_conflict(struct file_lock *caller_fl, struct file_lock *s ...@@ -580,8 +583,7 @@ static int flock_locks_conflict(struct file_lock *caller_fl, struct file_lock *s
/* FLOCK locks referring to the same filp do not conflict with /* FLOCK locks referring to the same filp do not conflict with
* each other. * each other.
*/ */
if (!(sys_fl->fl_flags & FL_FLOCK) || if (!IS_FLOCK(sys_fl) || (caller_fl->fl_file == sys_fl->fl_file))
(caller_fl->fl_file == sys_fl->fl_file))
return (0); return (0);
#ifdef MSNFS #ifdef MSNFS
if ((caller_fl->fl_type & LOCK_MAND) || (sys_fl->fl_type & LOCK_MAND)) if ((caller_fl->fl_type & LOCK_MAND) || (sys_fl->fl_type & LOCK_MAND))
...@@ -634,7 +636,7 @@ posix_test_lock(struct file *filp, struct file_lock *fl) ...@@ -634,7 +636,7 @@ posix_test_lock(struct file *filp, struct file_lock *fl)
lock_kernel(); lock_kernel();
for (cfl = filp->f_dentry->d_inode->i_flock; cfl; cfl = cfl->fl_next) { for (cfl = filp->f_dentry->d_inode->i_flock; cfl; cfl = cfl->fl_next) {
if (!(cfl->fl_flags & FL_POSIX)) if (!IS_POSIX(cfl))
continue; continue;
if (posix_locks_conflict(cfl, fl)) if (posix_locks_conflict(cfl, fl))
break; break;
...@@ -696,7 +698,7 @@ int locks_mandatory_locked(struct inode *inode) ...@@ -696,7 +698,7 @@ int locks_mandatory_locked(struct inode *inode)
*/ */
lock_kernel(); lock_kernel();
for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) { for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {
if (!(fl->fl_flags & FL_POSIX)) if (!IS_POSIX(fl))
continue; continue;
if (fl->fl_owner != owner) if (fl->fl_owner != owner)
break; break;
...@@ -732,7 +734,7 @@ int locks_mandatory_area(int read_write, struct inode *inode, ...@@ -732,7 +734,7 @@ int locks_mandatory_area(int read_write, struct inode *inode,
* the proposed read/write. * the proposed read/write.
*/ */
for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) { for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {
if (!(fl->fl_flags & FL_POSIX)) if (!IS_POSIX(fl))
continue; continue;
if (fl->fl_start > new_fl->fl_end) if (fl->fl_start > new_fl->fl_end)
break; break;
...@@ -790,7 +792,7 @@ static int flock_lock_file(struct file *filp, unsigned int lock_type, ...@@ -790,7 +792,7 @@ static int flock_lock_file(struct file *filp, unsigned int lock_type,
search: search:
change = 0; change = 0;
before = &inode->i_flock; before = &inode->i_flock;
while (((fl = *before) != NULL) && (fl->fl_flags & FL_FLOCK)) { while (((fl = *before) != NULL) && IS_FLOCK(fl)) {
if (filp == fl->fl_file) { if (filp == fl->fl_file) {
if (lock_type == fl->fl_type) if (lock_type == fl->fl_type)
goto out; goto out;
...@@ -815,7 +817,7 @@ static int flock_lock_file(struct file *filp, unsigned int lock_type, ...@@ -815,7 +817,7 @@ static int flock_lock_file(struct file *filp, unsigned int lock_type,
goto out; goto out;
repeat: repeat:
for (fl = inode->i_flock; (fl != NULL) && (fl->fl_flags & FL_FLOCK); for (fl = inode->i_flock; (fl != NULL) && IS_FLOCK(fl);
fl = fl->fl_next) { fl = fl->fl_next) {
if (!flock_locks_conflict(new_fl, fl)) if (!flock_locks_conflict(new_fl, fl))
continue; continue;
...@@ -880,7 +882,7 @@ int posix_lock_file(struct file *filp, struct file_lock *caller, ...@@ -880,7 +882,7 @@ int posix_lock_file(struct file *filp, struct file_lock *caller,
if (caller->fl_type != F_UNLCK) { if (caller->fl_type != F_UNLCK) {
repeat: repeat:
for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) { for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {
if (!(fl->fl_flags & FL_POSIX)) if (!IS_POSIX(fl))
continue; continue;
if (!posix_locks_conflict(caller, fl)) if (!posix_locks_conflict(caller, fl))
continue; continue;
...@@ -909,7 +911,7 @@ int posix_lock_file(struct file *filp, struct file_lock *caller, ...@@ -909,7 +911,7 @@ int posix_lock_file(struct file *filp, struct file_lock *caller,
/* First skip locks owned by other processes. /* First skip locks owned by other processes.
*/ */
while ((fl = *before) && (!(fl->fl_flags & FL_POSIX) || while ((fl = *before) && (!IS_POSIX(fl) ||
!locks_same_owner(caller, fl))) { !locks_same_owner(caller, fl))) {
before = &fl->fl_next; before = &fl->fl_next;
} }
...@@ -1085,7 +1087,7 @@ int __get_lease(struct inode *inode, unsigned int mode) ...@@ -1085,7 +1087,7 @@ int __get_lease(struct inode *inode, unsigned int mode)
if (error != 0) if (error != 0)
goto out; goto out;
flock = inode->i_flock; flock = inode->i_flock;
if (!(flock && (flock->fl_flags & FL_LEASE))) if (!(flock && IS_LEASE(flock)))
goto out; goto out;
} while (flock->fl_type & F_INPROGRESS); } while (flock->fl_type & F_INPROGRESS);
} }
...@@ -1110,7 +1112,7 @@ int __get_lease(struct inode *inode, unsigned int mode) ...@@ -1110,7 +1112,7 @@ int __get_lease(struct inode *inode, unsigned int mode)
do { do {
fl->fl_type = future; fl->fl_type = future;
fl = fl->fl_next; fl = fl->fl_next;
} while (fl != NULL && (fl->fl_flags & FL_LEASE)); } while (fl != NULL && IS_LEASE(fl));
kill_fasync(&flock->fl_fasync, SIGIO, POLL_MSG); kill_fasync(&flock->fl_fasync, SIGIO, POLL_MSG);
...@@ -1131,7 +1133,7 @@ int __get_lease(struct inode *inode, unsigned int mode) ...@@ -1131,7 +1133,7 @@ int __get_lease(struct inode *inode, unsigned int mode)
printk(KERN_WARNING "lease timed out\n"); printk(KERN_WARNING "lease timed out\n");
} else if (error > 0) { } else if (error > 0) {
flock = inode->i_flock; flock = inode->i_flock;
if (flock && (flock->fl_flags & FL_LEASE)) if (flock && IS_LEASE(flock))
goto restart; goto restart;
error = 0; error = 0;
} }
...@@ -1154,7 +1156,7 @@ int __get_lease(struct inode *inode, unsigned int mode) ...@@ -1154,7 +1156,7 @@ int __get_lease(struct inode *inode, unsigned int mode)
time_t lease_get_mtime(struct inode *inode) time_t lease_get_mtime(struct inode *inode)
{ {
struct file_lock *flock = inode->i_flock; struct file_lock *flock = inode->i_flock;
if (flock && (flock->fl_flags & FL_LEASE) && (flock->fl_type & F_WRLCK)) if (flock && IS_LEASE(flock) && (flock->fl_type & F_WRLCK))
return CURRENT_TIME; return CURRENT_TIME;
return inode->i_mtime; return inode->i_mtime;
} }
...@@ -1177,7 +1179,7 @@ int fcntl_getlease(struct file *filp) ...@@ -1177,7 +1179,7 @@ int fcntl_getlease(struct file *filp)
struct file_lock *fl; struct file_lock *fl;
fl = filp->f_dentry->d_inode->i_flock; fl = filp->f_dentry->d_inode->i_flock;
if ((fl == NULL) || ((fl->fl_flags & FL_LEASE) == 0)) if ((fl == NULL) || !IS_LEASE(fl))
return F_UNLCK; return F_UNLCK;
return fl->fl_type & ~F_INPROGRESS; return fl->fl_type & ~F_INPROGRESS;
} }
...@@ -1243,7 +1245,7 @@ int fcntl_setlease(unsigned int fd, struct file *filp, long arg) ...@@ -1243,7 +1245,7 @@ int fcntl_setlease(unsigned int fd, struct file *filp, long arg)
lock_kernel(); lock_kernel();
while ((fl = *before) != NULL) { while ((fl = *before) != NULL) {
if (fl->fl_flags != FL_LEASE) if (!IS_LEASE(fl))
break; break;
if (fl->fl_file == filp) if (fl->fl_file == filp)
my_before = before; my_before = before;
...@@ -1646,7 +1648,7 @@ void locks_remove_posix(struct file *filp, fl_owner_t owner) ...@@ -1646,7 +1648,7 @@ void locks_remove_posix(struct file *filp, fl_owner_t owner)
lock_kernel(); lock_kernel();
before = &inode->i_flock; before = &inode->i_flock;
while ((fl = *before) != NULL) { while ((fl = *before) != NULL) {
if ((fl->fl_flags & FL_POSIX) && fl->fl_owner == owner) { if (IS_POSIX(fl) && fl->fl_owner == owner) {
locks_unlock_delete(before); locks_unlock_delete(before);
before = &inode->i_flock; before = &inode->i_flock;
continue; continue;
...@@ -1672,8 +1674,7 @@ void locks_remove_flock(struct file *filp) ...@@ -1672,8 +1674,7 @@ void locks_remove_flock(struct file *filp)
before = &inode->i_flock; before = &inode->i_flock;
while ((fl = *before) != NULL) { while ((fl = *before) != NULL) {
if ((fl->fl_flags & (FL_FLOCK|FL_LEASE)) if ((IS_FLOCK(fl) || IS_LEASE(fl)) && (fl->fl_file == filp)) {
&& (fl->fl_file == filp)) {
locks_delete_lock(before, 0); locks_delete_lock(before, 0);
continue; continue;
} }
...@@ -1716,21 +1717,21 @@ static void lock_get_status(char* out, struct file_lock *fl, int id, char *pfx) ...@@ -1716,21 +1717,21 @@ static void lock_get_status(char* out, struct file_lock *fl, int id, char *pfx)
inode = fl->fl_file->f_dentry->d_inode; inode = fl->fl_file->f_dentry->d_inode;
out += sprintf(out, "%d:%s ", id, pfx); out += sprintf(out, "%d:%s ", id, pfx);
if (fl->fl_flags & FL_POSIX) { if (IS_POSIX(fl)) {
out += sprintf(out, "%6s %s ", out += sprintf(out, "%6s %s ",
(fl->fl_flags & FL_ACCESS) ? "ACCESS" : "POSIX ", (fl->fl_flags & FL_ACCESS) ? "ACCESS" : "POSIX ",
(inode == NULL) ? "*NOINODE*" : (inode == NULL) ? "*NOINODE*" :
(IS_MANDLOCK(inode) && (IS_MANDLOCK(inode) &&
(inode->i_mode & (S_IXGRP | S_ISGID)) == S_ISGID) ? (inode->i_mode & (S_IXGRP | S_ISGID)) == S_ISGID) ?
"MANDATORY" : "ADVISORY "); "MANDATORY" : "ADVISORY ");
} else if (fl->fl_flags & FL_FLOCK) { } else if (IS_FLOCK(fl)) {
#ifdef MSNFS #ifdef MSNFS
if (fl->fl_type & LOCK_MAND) { if (fl->fl_type & LOCK_MAND) {
out += sprintf(out, "FLOCK MSNFS "); out += sprintf(out, "FLOCK MSNFS ");
} else } else
#endif #endif
out += sprintf(out, "FLOCK ADVISORY "); out += sprintf(out, "FLOCK ADVISORY ");
} else if (fl->fl_flags & FL_LEASE) { } else if (IS_LEASE(fl)) {
out += sprintf(out, "LEASE MANDATORY "); out += sprintf(out, "LEASE MANDATORY ");
} else { } else {
out += sprintf(out, "UNKNOWN UNKNOWN "); out += sprintf(out, "UNKNOWN UNKNOWN ");
...@@ -1844,12 +1845,12 @@ int lock_may_read(struct inode *inode, loff_t start, unsigned long len) ...@@ -1844,12 +1845,12 @@ int lock_may_read(struct inode *inode, loff_t start, unsigned long len)
int result = 1; int result = 1;
lock_kernel(); lock_kernel();
for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) { for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {
if (fl->fl_flags == FL_POSIX) { if (IS_POSIX(fl)) {
if (fl->fl_type == F_RDLCK) if (fl->fl_type == F_RDLCK)
continue; continue;
if ((fl->fl_end < start) || (fl->fl_start > (start + len))) if ((fl->fl_end < start) || (fl->fl_start > (start + len)))
continue; continue;
} else if (fl->fl_flags == FL_FLOCK) { } else if (IS_FLOCK(fl)) {
if (!(fl->fl_type & LOCK_MAND)) if (!(fl->fl_type & LOCK_MAND))
continue; continue;
if (fl->fl_type & LOCK_READ) if (fl->fl_type & LOCK_READ)
...@@ -1882,10 +1883,10 @@ int lock_may_write(struct inode *inode, loff_t start, unsigned long len) ...@@ -1882,10 +1883,10 @@ int lock_may_write(struct inode *inode, loff_t start, unsigned long len)
int result = 1; int result = 1;
lock_kernel(); lock_kernel();
for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) { for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {
if (fl->fl_flags == FL_POSIX) { if (IS_POSIX(fl)) {
if ((fl->fl_end < start) || (fl->fl_start > (start + len))) if ((fl->fl_end < start) || (fl->fl_start > (start + len)))
continue; continue;
} else if (fl->fl_flags == FL_FLOCK) { } else if (IS_FLOCK(fl)) {
if (!(fl->fl_type & LOCK_MAND)) if (!(fl->fl_type & LOCK_MAND))
continue; continue;
if (fl->fl_type & LOCK_WRITE) if (fl->fl_type & LOCK_WRITE)
......
...@@ -232,6 +232,8 @@ typedef struct sigevent { ...@@ -232,6 +232,8 @@ typedef struct sigevent {
#ifdef __KERNEL__ #ifdef __KERNEL__
struct siginfo;
#ifndef HAVE_ARCH_COPY_SIGINFO #ifndef HAVE_ARCH_COPY_SIGINFO
#include <linux/string.h> #include <linux/string.h>
......
...@@ -16,7 +16,22 @@ extern unsigned int ___illegal_use_of_BTFIXUP_SIMM13_in_module(void); ...@@ -16,7 +16,22 @@ extern unsigned int ___illegal_use_of_BTFIXUP_SIMM13_in_module(void);
extern unsigned int ___illegal_use_of_BTFIXUP_SETHI_in_module(void); extern unsigned int ___illegal_use_of_BTFIXUP_SETHI_in_module(void);
extern unsigned int ___illegal_use_of_BTFIXUP_HALF_in_module(void); extern unsigned int ___illegal_use_of_BTFIXUP_HALF_in_module(void);
extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void);
#endif
#define BTFIXUP_SIMM13(__name) ___illegal_use_of_BTFIXUP_SIMM13_in_module()
#define BTFIXUP_HALF(__name) ___illegal_use_of_BTFIXUP_HALF_in_module()
#define BTFIXUP_SETHI(__name) ___illegal_use_of_BTFIXUP_SETHI_in_module()
#define BTFIXUP_INT(__name) ___illegal_use_of_BTFIXUP_INT_in_module()
#define BTFIXUP_BLACKBOX(__name) ___illegal_use_of_BTFIXUP_BLACKBOX_in_module
#else
#define BTFIXUP_SIMM13(__name) ___sf_##__name()
#define BTFIXUP_HALF(__name) ___af_##__name()
#define BTFIXUP_SETHI(__name) ___hf_##__name()
#define BTFIXUP_INT(__name) ((unsigned int)&___i_##__name)
/* This must be written in assembly and present in a sethi */
#define BTFIXUP_BLACKBOX(__name) ___b_##__name
#endif /* MODULE */
/* Fixup call xx */ /* Fixup call xx */
...@@ -30,12 +45,6 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); ...@@ -30,12 +45,6 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void);
#define BTFIXUPDEF_BLACKBOX(__name) \ #define BTFIXUPDEF_BLACKBOX(__name) \
extern unsigned ___bs_##__name[2]; extern unsigned ___bs_##__name[2];
#ifdef MODULE
#define BTFIXUP_BLACKBOX(__name) ___illegal_use_of_BTFIXUP_BLACKBOX_in_module
#else
/* This must be written in assembly and present in a sethi */
#define BTFIXUP_BLACKBOX(__name) ___b_##__name
#endif
/* Put bottom 13bits into some register variable */ /* Put bottom 13bits into some register variable */
...@@ -55,11 +64,6 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); ...@@ -55,11 +64,6 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void);
__asm__ ("or %%g0, ___s_" #__name "__btset_" #__val ", %0" : "=r"(ret));\ __asm__ ("or %%g0, ___s_" #__name "__btset_" #__val ", %0" : "=r"(ret));\
return ret; \ return ret; \
} }
#ifdef MODULE
#define BTFIXUP_SIMM13(__name) ___illegal_use_of_BTFIXUP_SIMM13_in_module()
#else
#define BTFIXUP_SIMM13(__name) ___sf_##__name()
#endif
/* Put either bottom 13 bits, or upper 22 bits into some register variable /* Put either bottom 13 bits, or upper 22 bits into some register variable
* (depending on the value, this will lead into sethi FIX, reg; or * (depending on the value, this will lead into sethi FIX, reg; or
...@@ -82,11 +86,6 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); ...@@ -82,11 +86,6 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void);
__asm__ ("or %%g0, ___a_" #__name "__btset_" #__val ", %0" : "=r"(ret));\ __asm__ ("or %%g0, ___a_" #__name "__btset_" #__val ", %0" : "=r"(ret));\
return ret; \ return ret; \
} }
#ifdef MODULE
#define BTFIXUP_HALF(__name) ___illegal_use_of_BTFIXUP_HALF_in_module()
#else
#define BTFIXUP_HALF(__name) ___af_##__name()
#endif
/* Put upper 22 bits into some register variable */ /* Put upper 22 bits into some register variable */
...@@ -107,22 +106,12 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void); ...@@ -107,22 +106,12 @@ extern unsigned int ___illegal_use_of_BTFIXUP_INT_in_module(void);
"=r"(ret)); \ "=r"(ret)); \
return ret; \ return ret; \
} }
#ifdef MODULE
#define BTFIXUP_SETHI(__name) ___illegal_use_of_BTFIXUP_SETHI_in_module()
#else
#define BTFIXUP_SETHI(__name) ___hf_##__name()
#endif
/* Put a full 32bit integer into some register variable */ /* Put a full 32bit integer into some register variable */
#define BTFIXUPDEF_INT(__name) \ #define BTFIXUPDEF_INT(__name) \
extern unsigned char ___i_##__name; \ extern unsigned char ___i_##__name; \
extern unsigned ___is_##__name[2]; extern unsigned ___is_##__name[2];
#ifdef MODULE
#define BTFIXUP_INT(__name) ___illegal_use_of_BTFIXUP_INT_in_module()
#else
#define BTFIXUP_INT(__name) ((unsigned int)&___i_##__name)
#endif
#define BTFIXUPCALL_NORM 0x00000000 /* Always call */ #define BTFIXUPCALL_NORM 0x00000000 /* Always call */
#define BTFIXUPCALL_NOP 0x01000000 /* Possibly optimize to nop */ #define BTFIXUPCALL_NOP 0x01000000 /* Possibly optimize to nop */
......
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
#define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE)
#define copy_page(to,from) memcpy((void *)(to), (void *)(from), PAGE_SIZE) #define copy_page(to,from) memcpy((void *)(to), (void *)(from), PAGE_SIZE)
#define clear_user_page(page, vaddr) clear_page(page) #define clear_user_page(addr, vaddr, page) clear_page(addr)
#define copy_user_page(to, from, vaddr) copy_page(to, from) #define copy_user_page(to, from, vaddr, page) copy_page(to, from)
/* The following structure is used to hold the physical /* The following structure is used to hold the physical
* memory configuration of the machine. This is filled in * memory configuration of the machine. This is filled in
......
/* $Id: ultra.h,v 1.2 1995/11/25 02:33:10 davem Exp $
* ultra.h: Definitions and defines for the TI V9 UltraSparc.
*
* Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
*/
#ifndef _SPARC_ULTRA_H
#define _SPARC_ULTRA_H
/* Spitfire MMU control register:
*
* ----------------------------------------------------------
* | | IMPL | VERS | | MID | |
* ----------------------------------------------------------
* 64 31-28 27-24 23-22 21-17 16 0
*
* IMPL: Implementation of this Spitfire.
* VERS: Version of this Spitfire.
* MID: Module ID of this processor.
*/
#define SPITFIRE_MIDMASK 0x00000000003e0000
/* Spitfire Load Store Unit control register:
*
* ---------------------------------------------------------------------
* | RSV | PWR | PWW | VWR | VWW | RSV | PMASK | DME | IME | DCE | ICE |
* ---------------------------------------------------------------------
* 63-25 24 23 22 21 20 19-4 3 2 1 0
*
* PWR: Physical Watchpoint Read enable: 0=off 1=on
* PWW: Physical Watchpoint Write enable: 0=off 1=on
* VWR: Virtual Watchpoint Read enable: 0=off 1=on
* VWW: Virtual Watchpoint Write enable: 0=off 1=on
* PMASK: Parity MASK ???
* DME: Data MMU Enable: 0=off 1=on
* IME: Instruction MMU Enable: 0=off 1=on
* DCE: Data Cache Enable: 0=off 1=on
* ICE: Instruction Cache Enable: 0=off 1=on
*/
#define SPITFIRE_LSU_PWR 0x01000000
#define SPITFIRE_LSU_PWW 0x00800000
#define SPITFIRE_LSU_VWR 0x00400000
#define SPITFIRE_LSU_VWW 0x00200000
#define SPITFIRE_LSU_PMASK 0x000ffff0
#define SPITFIRE_LSU_DME 0x00000008
#define SPITFIRE_LSU_IME 0x00000004
#define SPITFIRE_LSU_DCE 0x00000002
#define SPITFIRE_LSU_ICE 0x00000001
#endif /* !(_SPARC_ULTRA_H) */
...@@ -107,8 +107,6 @@ struct sun4c_vac_props { ...@@ -107,8 +107,6 @@ struct sun4c_vac_props {
extern struct sun4c_vac_props sun4c_vacinfo; extern struct sun4c_vac_props sun4c_vacinfo;
extern void sun4c_flush_all(void);
/* sun4c_enable_vac() enables the sun4c virtual address cache. */ /* sun4c_enable_vac() enables the sun4c virtual address cache. */
extern __inline__ void sun4c_enable_vac(void) extern __inline__ void sun4c_enable_vac(void)
{ {
......
...@@ -35,8 +35,9 @@ extern void do_BUG(const char *file, int line); ...@@ -35,8 +35,9 @@ extern void do_BUG(const char *file, int line);
extern void _clear_page(void *page); extern void _clear_page(void *page);
#define clear_page(X) _clear_page((void *)(X)) #define clear_page(X) _clear_page((void *)(X))
extern void clear_user_page(void *page, unsigned long vaddr); struct page;
extern void copy_user_page(void *to, void *from, unsigned long vaddr); extern void clear_user_page(void *addr, unsigned long vaddr, struct page *page);
extern void copy_user_page(void *to, void *from, unsigned long vaddr, struct page *topage);
/* GROSS, defining this makes gcc pass these types as aggregates, /* GROSS, defining this makes gcc pass these types as aggregates,
* and thus on the stack, turn this crap off... -DaveM * and thus on the stack, turn this crap off... -DaveM
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#define BOND_STATE_ACTIVE 0 /* link is active */ #define BOND_STATE_ACTIVE 0 /* link is active */
#define BOND_STATE_BACKUP 1 /* link is backup */ #define BOND_STATE_BACKUP 1 /* link is backup */
#define MAX_BONDS 1 /* Maximum number of devices to support */ #define BOND_DEFAULT_MAX_BONDS 1 /* Default maximum number of devices to support */
typedef struct ifbond { typedef struct ifbond {
__s32 bond_mode; __s32 bond_mode;
...@@ -76,6 +76,7 @@ typedef struct slave { ...@@ -76,6 +76,7 @@ typedef struct slave {
short delay; short delay;
char link; /* one of BOND_LINK_XXXX */ char link; /* one of BOND_LINK_XXXX */
char state; /* one of BOND_STATE_XXXX */ char state; /* one of BOND_STATE_XXXX */
unsigned short original_flags;
u32 link_failure_count; u32 link_failure_count;
} slave_t; } slave_t;
...@@ -104,6 +105,8 @@ typedef struct bonding { ...@@ -104,6 +105,8 @@ typedef struct bonding {
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
struct bonding *next_bond; struct bonding *next_bond;
struct net_device *device; struct net_device *device;
struct dev_mc_list *mc_list;
unsigned short flags;
} bonding_t; } bonding_t;
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -61,7 +61,7 @@ extern initcall_t __initcall_start, __initcall_end; ...@@ -61,7 +61,7 @@ extern initcall_t __initcall_start, __initcall_end;
static initcall_t __initcall_##fn __attribute__ ((unused,__section__ (".initcall" level ".init"))) = fn static initcall_t __initcall_##fn __attribute__ ((unused,__section__ (".initcall" level ".init"))) = fn
#define core_initcall(fn) __define_initcall("1",fn) #define core_initcall(fn) __define_initcall("1",fn)
#define unused_initcall(fn) __define_initcall("2",fn) #define postcore_initcall(fn) __define_initcall("2",fn)
#define arch_initcall(fn) __define_initcall("3",fn) #define arch_initcall(fn) __define_initcall("3",fn)
#define subsys_initcall(fn) __define_initcall("4",fn) #define subsys_initcall(fn) __define_initcall("4",fn)
#define fs_initcall(fn) __define_initcall("5",fn) #define fs_initcall(fn) __define_initcall("5",fn)
...@@ -160,7 +160,7 @@ typedef void (*__cleanup_module_func_t)(void); ...@@ -160,7 +160,7 @@ typedef void (*__cleanup_module_func_t)(void);
#define __setup(str,func) /* nothing */ #define __setup(str,func) /* nothing */
#define core_initcall(fn) module_init(fn) #define core_initcall(fn) module_init(fn)
#define unused_initcall(fn) module_init(fn) #define postcore_initcall(fn) module_init(fn)
#define arch_initcall(fn) module_init(fn) #define arch_initcall(fn) module_init(fn)
#define subsys_initcall(fn) module_init(fn) #define subsys_initcall(fn) module_init(fn)
#define fs_initcall(fn) module_init(fn) #define fs_initcall(fn) module_init(fn)
......
...@@ -137,10 +137,9 @@ void xdr_zero_iovec(struct iovec *, int, size_t); ...@@ -137,10 +137,9 @@ void xdr_zero_iovec(struct iovec *, int, size_t);
/* /*
* XDR buffer helper functions * XDR buffer helper functions
*/ */
extern int xdr_kmap(struct iovec *, struct xdr_buf *, unsigned int); extern int xdr_kmap(struct iovec *, struct xdr_buf *, size_t);
extern void xdr_kunmap(struct xdr_buf *, unsigned int); extern void xdr_kunmap(struct xdr_buf *, size_t);
extern void xdr_shift_buf(struct xdr_buf *, unsigned int); extern void xdr_shift_buf(struct xdr_buf *, size_t);
extern void xdr_zero_buf(struct xdr_buf *, unsigned int);
/* /*
* Helper structure for copying from an sk_buff. * Helper structure for copying from an sk_buff.
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#ifndef _ZLIB_H #ifndef _ZLIB_H
#define _ZLIB_H #define _ZLIB_H
#include "zconf.h" #include <linux/zconf.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#define PSCHED_CLOCK_SOURCE PSCHED_JIFFIES #define PSCHED_CLOCK_SOURCE PSCHED_JIFFIES
#include <linux/config.h> #include <linux/config.h>
#include <linux/types.h>
#include <linux/pkt_sched.h> #include <linux/pkt_sched.h>
#include <net/pkt_cls.h> #include <net/pkt_cls.h>
...@@ -221,7 +222,7 @@ extern psched_time_t psched_time_base; ...@@ -221,7 +222,7 @@ extern psched_time_t psched_time_base;
#define PSCHED_EXPORTLIST_2 #define PSCHED_EXPORTLIST_2
#if ~0UL == 0xFFFFFFFF #if BITS_PER_LONG <= 32
#define PSCHED_WATCHER unsigned long #define PSCHED_WATCHER unsigned long
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
* To avoid associated bogus bug reports, we flatly refuse to compile * To avoid associated bogus bug reports, we flatly refuse to compile
* with a gcc that is known to be too old from the very beginning. * with a gcc that is known to be too old from the very beginning.
*/ */
#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 95) #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 91)
#error Sorry, your GCC is too old. It builds incorrect kernels. #error Sorry, your GCC is too old. It builds incorrect kernels.
#endif #endif
......
...@@ -33,14 +33,10 @@ ...@@ -33,14 +33,10 @@
#include <linux/futex.h> #include <linux/futex.h>
#include <linux/highmem.h> #include <linux/highmem.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/pagemap.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
/* These mutexes are a very simple counter: the winner is the one who /* Simple "sleep if unchanged" interface. */
decrements from 1 to 0. The counter starts at 1 when the lock is
free. A value other than 0 or 1 means someone may be sleeping.
This is simple enough to work on all architectures, but has the
problem that if we never "up" the semaphore it could eventually
wrap around. */
/* FIXME: This may be way too small. --RR */ /* FIXME: This may be way too small. --RR */
#define FUTEX_HASHBITS 6 #define FUTEX_HASHBITS 6
...@@ -49,7 +45,7 @@ ...@@ -49,7 +45,7 @@
the relevent ones (hashed queues may be shared) */ the relevent ones (hashed queues may be shared) */
struct futex_q { struct futex_q {
struct list_head list; struct list_head list;
struct task_struct *task; wait_queue_head_t waiters;
/* Page struct and offset within it. */ /* Page struct and offset within it. */
struct page *page; struct page *page;
unsigned int offset; unsigned int offset;
...@@ -69,6 +65,11 @@ static inline struct list_head *hash_futex(struct page *page, ...@@ -69,6 +65,11 @@ static inline struct list_head *hash_futex(struct page *page,
return &futex_queues[hash_long(h, FUTEX_HASHBITS)]; return &futex_queues[hash_long(h, FUTEX_HASHBITS)];
} }
static inline void tell_waiter(struct futex_q *q)
{
wake_up_all(&q->waiters);
}
static int futex_wake(struct list_head *head, static int futex_wake(struct list_head *head,
struct page *page, struct page *page,
unsigned int offset, unsigned int offset,
...@@ -83,7 +84,7 @@ static int futex_wake(struct list_head *head, ...@@ -83,7 +84,7 @@ static int futex_wake(struct list_head *head,
if (this->page == page && this->offset == offset) { if (this->page == page && this->offset == offset) {
list_del_init(i); list_del_init(i);
wake_up_process(this->task); tell_waiter(this);
num_woken++; num_woken++;
if (num_woken >= num) break; if (num_woken >= num) break;
} }
...@@ -94,11 +95,12 @@ static int futex_wake(struct list_head *head, ...@@ -94,11 +95,12 @@ static int futex_wake(struct list_head *head,
/* Add at end to avoid starvation */ /* Add at end to avoid starvation */
static inline void queue_me(struct list_head *head, static inline void queue_me(struct list_head *head,
wait_queue_t *wait,
struct futex_q *q, struct futex_q *q,
struct page *page, struct page *page,
unsigned int offset) unsigned int offset)
{ {
q->task = current; add_wait_queue(&q->waiters, wait);
q->page = page; q->page = page;
q->offset = offset; q->offset = offset;
...@@ -150,18 +152,20 @@ static int futex_wait(struct list_head *head, ...@@ -150,18 +152,20 @@ static int futex_wait(struct list_head *head,
{ {
int curval; int curval;
struct futex_q q; struct futex_q q;
DECLARE_WAITQUEUE(wait, current);
int ret = 0; int ret = 0;
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
queue_me(head, &q, page, offset); queue_me(head, &wait, &q, page, offset);
/* Page is pinned, can't fail */ /* Page is pinned, but may no longer be in this address space. */
if (get_user(curval, uaddr) != 0) if (get_user(curval, uaddr) != 0) {
BUG(); ret = -EFAULT;
goto out;
}
if (curval != val) { if (curval != val) {
ret = -EWOULDBLOCK; ret = -EWOULDBLOCK;
set_current_state(TASK_RUNNING);
goto out; goto out;
} }
time = schedule_timeout(time); time = schedule_timeout(time);
...@@ -174,6 +178,7 @@ static int futex_wait(struct list_head *head, ...@@ -174,6 +178,7 @@ static int futex_wait(struct list_head *head,
goto out; goto out;
} }
out: out:
set_current_state(TASK_RUNNING);
/* Were we woken up anyway? */ /* Were we woken up anyway? */
if (!unqueue_me(&q)) if (!unqueue_me(&q))
return 0; return 0;
...@@ -218,7 +223,7 @@ asmlinkage int sys_futex(void *uaddr, int op, int val, struct timespec *utime) ...@@ -218,7 +223,7 @@ asmlinkage int sys_futex(void *uaddr, int op, int val, struct timespec *utime)
default: default:
ret = -EINVAL; ret = -EINVAL;
} }
put_page(page); page_cache_release(page);
return ret; return ret;
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
* *
* Fixes: * Fixes:
* Hideaki YOSHIFUJI : sin6_scope_id support * Hideaki YOSHIFUJI : sin6_scope_id support
* YOSHIFUJI,H.@USAGI : raw checksum (RFC2292(bis) compliance)
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
...@@ -487,11 +488,18 @@ static int rawv6_frag_cksum(const void *data, struct in6_addr *addr, ...@@ -487,11 +488,18 @@ static int rawv6_frag_cksum(const void *data, struct in6_addr *addr,
hdr->cksum = csum_ipv6_magic(addr, daddr, hdr->len, hdr->cksum = csum_ipv6_magic(addr, daddr, hdr->len,
hdr->proto, hdr->cksum); hdr->proto, hdr->cksum);
if (opt->offset < len) { if (opt->offset + 1 < len) {
__u16 *csum; __u16 *csum;
csum = (__u16 *) (buff + opt->offset); csum = (__u16 *) (buff + opt->offset);
*csum = hdr->cksum; if (*csum) {
/* in case cksum was not initialized */
__u32 sum = hdr->cksum;
sum += *csum;
*csum = hdr->cksum = (sum + (sum>>16));
} else {
*csum = hdr->cksum;
}
} else { } else {
if (net_ratelimit()) if (net_ratelimit())
printk(KERN_DEBUG "icmp: cksum offset too big\n"); printk(KERN_DEBUG "icmp: cksum offset too big\n");
...@@ -720,6 +728,10 @@ static int rawv6_setsockopt(struct sock *sk, int level, int optname, ...@@ -720,6 +728,10 @@ static int rawv6_setsockopt(struct sock *sk, int level, int optname,
switch (optname) { switch (optname) {
case IPV6_CHECKSUM: case IPV6_CHECKSUM:
/* You may get strange result with a positive odd offset;
RFC2292bis agrees with me. */
if (val > 0 && (val&1))
return(-EINVAL);
if (val < 0) { if (val < 0) {
opt->checksum = 0; opt->checksum = 0;
} else { } else {
...@@ -817,6 +829,11 @@ static void rawv6_close(struct sock *sk, long timeout) ...@@ -817,6 +829,11 @@ static void rawv6_close(struct sock *sk, long timeout)
static int rawv6_init_sk(struct sock *sk) static int rawv6_init_sk(struct sock *sk)
{ {
if (inet_sk(sk)->num == IPPROTO_ICMPV6) {
struct raw6_opt *opt = raw6_sk(sk);
opt->checksum = 1;
opt->offset = 2;
}
return(0); return(0);
} }
......
...@@ -1117,7 +1117,7 @@ static void psched_tick(unsigned long dummy) ...@@ -1117,7 +1117,7 @@ static void psched_tick(unsigned long dummy)
psched_timer.expires = jiffies + 1*HZ; psched_timer.expires = jiffies + 1*HZ;
#else #else
unsigned long now = jiffies; unsigned long now = jiffies;
psched_time_base = ((u64)now)<<PSCHED_JSCALE; psched_time_base += ((u64)(now-psched_time_mark))<<PSCHED_JSCALE;
psched_time_mark = now; psched_time_mark = now;
psched_timer.expires = now + 60*60*HZ; psched_timer.expires = now + 60*60*HZ;
#endif #endif
......
...@@ -176,7 +176,7 @@ void xdr_shift_iovec(struct iovec *iov, int nr, size_t len) ...@@ -176,7 +176,7 @@ void xdr_shift_iovec(struct iovec *iov, int nr, size_t len)
/* /*
* Map a struct xdr_buf into an iovec array. * Map a struct xdr_buf into an iovec array.
*/ */
int xdr_kmap(struct iovec *iov_base, struct xdr_buf *xdr, unsigned int base) int xdr_kmap(struct iovec *iov_base, struct xdr_buf *xdr, size_t base)
{ {
struct iovec *iov = iov_base; struct iovec *iov = iov_base;
struct page **ppage = xdr->pages; struct page **ppage = xdr->pages;
...@@ -226,7 +226,7 @@ int xdr_kmap(struct iovec *iov_base, struct xdr_buf *xdr, unsigned int base) ...@@ -226,7 +226,7 @@ int xdr_kmap(struct iovec *iov_base, struct xdr_buf *xdr, unsigned int base)
return (iov - iov_base); return (iov - iov_base);
} }
void xdr_kunmap(struct xdr_buf *xdr, unsigned int base) void xdr_kunmap(struct xdr_buf *xdr, size_t base)
{ {
struct page **ppage = xdr->pages; struct page **ppage = xdr->pages;
unsigned int pglen = xdr->page_len; unsigned int pglen = xdr->page_len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment