diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-18 05:39:10 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-18 05:39:10 -0400 |
| commit | b2b4b9a7c09ad66e095b13c97946a96f2dc8284e (patch) | |
| tree | fb856b5998df266bd83e6e64b8884287e812845a /drivers/char | |
| parent | 875999c5539999f61a45620aae0c3e5fb1d2b035 (diff) | |
| parent | 4741c336d27dec3ea68a35659abb8dc82b142388 (diff) | |
| download | kernel-crypto-b2b4b9a7c09ad66e095b13c97946a96f2dc8284e.tar.gz kernel-crypto-b2b4b9a7c09ad66e095b13c97946a96f2dc8284e.tar.xz kernel-crypto-b2b4b9a7c09ad66e095b13c97946a96f2dc8284e.zip | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/agp/efficeon-agp.c | 8 | ||||
| -rw-r--r-- | drivers/char/tty_io.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/char/agp/efficeon-agp.c b/drivers/char/agp/efficeon-agp.c index fed0a87448d..86a966b6523 100644 --- a/drivers/char/agp/efficeon-agp.c +++ b/drivers/char/agp/efficeon-agp.c @@ -64,6 +64,12 @@ static struct gatt_mask efficeon_generic_masks[] = {.mask = 0x00000001, .type = 0} }; +/* This function does the same thing as mask_memory() for this chipset... */ +static inline unsigned long efficeon_mask_memory(unsigned long addr) +{ + return addr | 0x00000001; +} + static struct aper_size_info_lvl2 efficeon_generic_sizes[4] = { {256, 65536, 0}, @@ -251,7 +257,7 @@ static int efficeon_insert_memory(struct agp_memory * mem, off_t pg_start, int t last_page = NULL; for (i = 0; i < count; i++) { int index = pg_start + i; - unsigned long insert = mem->memory[i]; + unsigned long insert = efficeon_mask_memory(mem->memory[i]); page = (unsigned int *) efficeon_private.l1_table[index >> 10]; diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index f70a47eadb5..841f0bd3eaa 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -2734,7 +2734,7 @@ static void __do_SAK(void *arg) printk(KERN_NOTICE "SAK: killed process %d" " (%s): fd#%d opened to the tty\n", p->pid, p->comm, i); - send_sig(SIGKILL, p, 1); + force_sig(SIGKILL, p); break; } } |