Commit 7190053f authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/davem/BK/net-2.5

into home.osdl.org:/home/torvalds/v2.5/linux
parents 873fba1b d9898081
...@@ -1910,7 +1910,7 @@ unw_unwind_to_user (struct unw_frame_info *info) ...@@ -1910,7 +1910,7 @@ unw_unwind_to_user (struct unw_frame_info *info)
__FUNCTION__, ip); __FUNCTION__, ip);
return -1; return -1;
} }
if (ip < GATE_ADDR) if (ip < FIXADDR_USER_END)
return 0; return 0;
} }
unw_get_ip(info, &ip); unw_get_ip(info, &ip);
......
...@@ -524,7 +524,7 @@ static int smsc_ircc_present(unsigned int fir_base, unsigned int sir_base) ...@@ -524,7 +524,7 @@ static int smsc_ircc_present(unsigned int fir_base, unsigned int sir_base)
return 0; return 0;
out3: out3:
release_region(fir_base, SMSC_IRCC2_FIR_CHIP_IO_EXTENT); release_region(sir_base, SMSC_IRCC2_SIR_CHIP_IO_EXTENT);
out2: out2:
release_region(fir_base, SMSC_IRCC2_FIR_CHIP_IO_EXTENT); release_region(fir_base, SMSC_IRCC2_FIR_CHIP_IO_EXTENT);
out1: out1:
......
...@@ -198,6 +198,7 @@ void proc_tty_register_driver(struct tty_driver *driver) ...@@ -198,6 +198,7 @@ void proc_tty_register_driver(struct tty_driver *driver)
return; return;
ent->read_proc = driver->read_proc; ent->read_proc = driver->read_proc;
ent->write_proc = driver->write_proc; ent->write_proc = driver->write_proc;
ent->owner = driver->owner;
ent->data = driver; ent->data = driver;
driver->proc_entry = ent; driver->proc_entry = ent;
......
...@@ -496,6 +496,6 @@ extern void update_mmu_cache (struct vm_area_struct *vma, unsigned long vaddr, p ...@@ -496,6 +496,6 @@ extern void update_mmu_cache (struct vm_area_struct *vma, unsigned long vaddr, p
/* These tell get_user_pages() that the first gate page is accessible from user-level. */ /* These tell get_user_pages() that the first gate page is accessible from user-level. */
#define FIXADDR_USER_START GATE_ADDR #define FIXADDR_USER_START GATE_ADDR
#define FIXADDR_USER_END (GATE_ADDR + 2*PAGE_SIZE) #define FIXADDR_USER_END (GATE_ADDR + 2*PERCPU_PAGE_SIZE)
#endif /* _ASM_IA64_PGTABLE_H */ #endif /* _ASM_IA64_PGTABLE_H */
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