Skip to content

L
linux
Commit 832c29d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Import 2.1.12

parent ffdafb5e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2547 additions and 1508 deletions
CREDITS
View file @ 832c29d4
......@@ -68,7 +68,7 @@ D: Wrote SYS V IPC (part of standard kernel since 0.99.10)
N: Dario Ballabio
E: dario@milano.europe.dg.com
D: Author and maintainer of the Ultrastor 14F/34F SCSI driver
D: Author and maintainer of the EATA ISA/EISA SCSI driver
D: Author and maintainer of the EATA ISA/EISA/PCI SCSI driver
S: Data General Corporation
S: Milano
S: Italy
......
Documentation/Configure.help
View file @ 832c29d4
......@@ -1395,14 +1395,14 @@ CONFIG_SCSI_EATA_PIO
UltraStor 14F/34F support
CONFIG_SCSI_U14_34F
This is support for the UltraStor 14F, 24F and 34F SCSI-2 host
adaptor family. The source at drivers/scsi/u14-34f.c contains some
information about this hardware. If the driver doesn't work out of
the box, you may have to change some settings in
drivers/scsi/u14-34f.h. Read the SCSI-HOWTO, available via ftp
(user: anonymous) at sunsite.unc.edu:/pub/Linux/docs/HOWTO. Note
that there is also another driver for the same hardware: "UltraStor
SCSI support", below. You should only enable one of them. This
This is support for the UltraStor 14F and 34F SCSI-2 host adapters.
The source at drivers/scsi/u14-34f.c contains some information about
this hardware. If the driver doesn't work out of the box, you may have
to change some settings in drivers/scsi/u14-34f.c.
Read the SCSI-HOWTO, available via ftp (user: anonymous) at
sunsite.unc.edu:/pub/Linux/docs/HOWTO. Note that there is also another
driver for the same hardware: "UltraStor SCSI support", below.
You should enable both only if you want 24F support as well. This
driver is also available as a module ( = code which can be inserted
in and removed from the running kernel whenever you want). If you
want to compile it as a module, say M here and read
......@@ -1649,9 +1649,8 @@ CONFIG_SCSI_ULTRASTOR
drivers/scsi/ultrastor.h. If you want to compile this as a module (
= code which can be inserted in and removed from the running kernel
whenever you want), say M here and read Documentation/modules.txt.
Note that there is also another driver for the same hardware:
"UltraStor 14F/34F support", above. You should only enable one of
them.
Note that there is also another driver for UltraStor hardware:
"UltraStor 14F/34F support", above.
7000FASST SCSI support
CONFIG_SCSI_7000FASST
......@@ -1662,12 +1661,16 @@ CONFIG_SCSI_7000FASST
want to compile it as a module, say M here and read
Documentation/modules.txt.
EATA ISA/EISA (DPT PM2011/021/012/022/122/322) support
EATA ISA/EISA/PCI (DPT and generic EATA/DMA-compliant boards) support
CONFIG_SCSI_EATA
This driver supports all the DPT SCSI host adapters, such as
PM2011B/9X, PM2021A/9X, PM2012A, PM1012B, PM2022A/9X, PM2122A/9X and
PM2322A/9X. Note that the PM2001 is not supported by this
driver. You want to read the start of drivers/scsi/eata.c and the
This driver supports all the EATA/DMA-compliant SCSI host adapters
and does not need any BIOS32 or PCI BIOS service.
Only ISA (0x1F0, 0x170, 0x230, 0x330) and EISA (0x1C88 through 0xFC88)
addresses are probed. In order to detect a generic EATA PCI board you
can force on it any unused EISA address.
Note that there is also another driver for the same hardware:
"EATA-DMA support". You should enable only one of them.
You want to read the start of drivers/scsi/eata.c and the
SCSI-HOWTO, available via ftp (user: anonymous) at
sunsite.unc.edu:/pub/Linux/docs/HOWTO. If you want to compile this
as a module ( = code which can be inserted in and removed from the
......
Documentation/java.txt
View file @ 832c29d4
Java(tm) Binary Kernel Support for Linux v1.01
Java(tm) Binary Kernel Support for Linux v1.02
----------------------------------------------
Linux beats them ALL! While all other OS's are TALKING about direct
......@@ -13,9 +13,9 @@ small details:
ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO/Java-HOWTO
If you install the JDK in a location other than the suggested
directory of /usr/local/java, then you will need to tell the
kernel where you put the Java interpreter.
If you install the JDK in a location other than /usr/bin/java,
then you will need to tell the kernel where you put the Java
interpreter.
There are two ways to do this.
One, edit fs/binfmt_java.c file and make the needed change to
the _PATH_JAVA definition at the top of that file.
......@@ -36,6 +36,14 @@ small details:
as a loadable module. If a module, load it with insmod or
kerneld.
5) A caveat. When executing a java file, the java interpreter is
invoked only with the class name, not with the complete file path.
Therefore it is possible that the file the shell finds with PATH
is not the same file the java interpreter finds with CLASSPATH.
The recommended solution is to make symbolic links from a directory
in PATH to the actual class file in CLASSPATH, e.g.,
/usr/local/bin/myapp -> /usr/local/java/classes/myapp.class.
To test your new setup, enter in the following simple Java app, and name
it "HelloWorld.java":
......@@ -79,8 +87,8 @@ demo/Blink/example1.html file), and:
Java Applet support, so the modified file can still be used
with all known browsers.
2) If you install the JDK in a location other than the suggested
directory of /usr/local/java, then you will need to tell the
2) If you install the applet viewer in a location other than
/usr/bin/appletviewer, then you will need to tell the
kernel where you put the Java appletviewer.
There are two ways to do this.
One, edit fs/binfmt_java.c file and make the needed change to
......
MAINTAINERS
View file @ 832c29d4
......@@ -147,16 +147,16 @@ M: Marcio Saito <marcio@cyclades.com>
W: http://www.cyclades.com/
S: Supported
EATA ISA/EISA SCSI DRIVER
EATA ISA/EISA/PCI SCSI DRIVER
P: Dario Ballabio
M: dario@milano.europe.dg.com
L: linux-kernel@vger.rutgers.edu
L: linux-scsi@vger.rutgers.edu
S: Maintained
U14-34F SCSI DRIVER
P: Dario Ballabio
M: dario@milano.europe.dg.com
L: linux-kernel@vger.rutgers.edu
L: linux-scsi@vger.rutgers.edu
S: Maintained
EATA-DMA SCSI DRIVER
......
Makefile
View file @ 832c29d4
VERSION = 2
PATCHLEVEL = 1
SUBLEVEL = 11
SUBLEVEL = 12
ARCH = i386
......
arch/m68k/Makefile
View file @ 832c29d4
......@@ -13,26 +13,23 @@
# Copyright (C) 1994 by Hamish Macdonald
#
# test for cross compiling
COMPILE_ARCH = $(shell uname -m)
# override top level makefile
AS += -m68020
ifdef CONFIG_KERNEL_ELF
AS = as -m68020
LD = ld -m m68kelf
CC := $(CC)
# set up for cross compiling
COMPILE_ARCH = $(shell uname -m)
LD += -m m68kelf
ifneq ($(COMPILE_ARCH),$(ARCH))
CROSSDIR=/usr/$(ARCH)-linux/bin
CC := $(CROSSDIR)/$(CC)
AS := $(CROSSDIR)/$(AS)
LD := $(CROSSDIR)/$(LD)
AR := $(CROSSDIR)/$(AR)
NM := $(CROSSDIR)/$(NM)
STRIP := $(CROSSDIR)/$(STRIP)
# prefix for cross-compiling binaries
CROSS_COMPILE = m68k-linux-
endif
else
AS = /usr/m68k-linuxaout/bin/as -m68020
CC := $(CC) -pipe -b m68k-linuxaout
LD = ld -m m68klinux
LD += -m m68klinux
ifneq ($(COMPILE_ARCH),$(ARCH))
# prefix for cross-compiling binaries
CROSS_COMPILE = m68k-linuxaout-
endif
endif
#
......@@ -57,6 +54,10 @@ ifdef CONFIG_OPTIMIZE_040
CFLAGS := $(CFLAGS) -m68040
endif
ifdef CONFIG_OPTIMIZE_060
CFLAGS := $(CFLAGS) -m68020-40 -Wa,-m68060
endif
HEAD := arch/m68k/kernel/head.o
SUBDIRS += arch/m68k/kernel arch/m68k/mm arch/m68k/console arch/m68k/lib
......
arch/m68k/amiga/amifb.c
View file @ 832c29d4
......@@ -51,7 +51,7 @@
#include <linux/config.h>
#include <linux/interrupt.h>
#include <asm/setup.h>
#include <asm/segment.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/amigahw.h>
......@@ -144,7 +144,7 @@
- hsstop: End of horizontal synchronization pulse
- htotal: Last value on the line (i.e. line length = htotal+1)
- vsstrt: Start of vertical synchronization pulse
- vsstop: Start of vertical synchronization pulse
- vsstop: End of vertical synchronization pulse
- vtotal: Last line value (i.e. number of lines = vtotal+1)
- hcenter: Start of vertical retrace for interlace
......@@ -154,7 +154,7 @@
- hbstrt: Start of horizontal blank
- hbstop: End of horizontal blank
- vbstrt: Start of vertical blank
- vbstop: Start of vertical blank
- vbstop: End of vertical blank
Horizontal values are in color clock cycles (280 ns), vertical values are in
scanlines.
......@@ -1679,7 +1679,7 @@ static int amiga_fb_ioctl(struct inode *inode, struct file *file,
i = verify_area(VERIFY_WRITE, (void *)arg, sizeof(crsrfix));
if (!i) {
i = amiga_fb_get_fix_cursorinfo(&crsrfix, con);
memcpy_tofs((void *)arg, &crsrfix, sizeof(crsrfix));
copy_to_user((void *)arg, &crsrfix, sizeof(crsrfix));
}
return i;
}
......@@ -1690,7 +1690,7 @@ static int amiga_fb_ioctl(struct inode *inode, struct file *file,
if (!i) {
i = amiga_fb_get_var_cursorinfo(&crsrvar,
((struct fb_var_cursorinfo *)arg)->data, con);
memcpy_tofs((void *)arg, &crsrvar, sizeof(crsrvar));
copy_to_user((void *)arg, &crsrvar, sizeof(crsrvar));
}
return i;
}
......@@ -1699,7 +1699,7 @@ static int amiga_fb_ioctl(struct inode *inode, struct file *file,
i = verify_area(VERIFY_READ, (void *)arg, sizeof(crsrvar));
if (!i) {
memcpy_fromfs(&crsrvar, (void *)arg, sizeof(crsrvar));
copy_from_user(&crsrvar, (void *)arg, sizeof(crsrvar));
i = amiga_fb_set_var_cursorinfo(&crsrvar,
((struct fb_var_cursorinfo *)arg)->data, con);
}
......@@ -1711,7 +1711,7 @@ static int amiga_fb_ioctl(struct inode *inode, struct file *file,
i = verify_area(VERIFY_WRITE, (void *)arg, sizeof(crsrstate));
if (!i) {
i = amiga_fb_get_cursorstate(&crsrstate, con);
memcpy_tofs((void *)arg, &crsrstate, sizeof(crsrstate));
copy_to_user((void *)arg, &crsrstate, sizeof(crsrstate));
}
return i;
}
......@@ -1720,7 +1720,7 @@ static int amiga_fb_ioctl(struct inode *inode, struct file *file,
i = verify_area(VERIFY_READ, (void *)arg, sizeof(crsrstate));
if (!i) {
memcpy_fromfs(&crsrstate, (void *)arg, sizeof(crsrstate));
copy_from_user(&crsrstate, (void *)arg, sizeof(crsrstate));
i = amiga_fb_set_cursorstate(&crsrstate, con);
}
return i;
......@@ -1732,7 +1732,7 @@ static int amiga_fb_ioctl(struct inode *inode, struct file *file,
i = verify_area(VERIFY_WRITE, (void *)arg, sizeof(struct amiga_fb_par));
if (!i) {
ami_get_par(&par);
memcpy_tofs((void *)arg, &par, sizeof(struct amiga_fb_par));
copy_to_user((void *)arg, &par, sizeof(struct amiga_fb_par));
}
return i;
}
......@@ -1741,7 +1741,7 @@ static int amiga_fb_ioctl(struct inode *inode, struct file *file,
i = verify_area(VERIFY_READ, (void *)arg, sizeof(struct amiga_fb_par));
if (!i) {
memcpy_fromfs(&par, (void *)arg, sizeof(struct amiga_fb_par));
copy_from_user(&par, (void *)arg, sizeof(struct amiga_fb_par));
ami_set_par(&par);
}
return i;
......@@ -2044,11 +2044,11 @@ static int do_fb_get_cmap(struct fb_cmap *cmap, struct fb_var_screeninfo *var,
if (transp)
*transp = htransp;
} else {
put_fs_word(hred, red);
put_fs_word(hgreen, green);
put_fs_word(hblue, blue);
put_user(hred, red);
put_user(hgreen, green);
put_user(hblue, blue);
if (transp)
put_fs_word(htransp, transp);
put_user(htransp, transp);
}
red++;
green++;
......@@ -2081,10 +2081,13 @@ static int do_fb_set_cmap(struct fb_cmap *cmap, struct fb_var_screeninfo *var,
hblue = *blue;
htransp = transp ? *transp : 0;
} else {
hred = get_fs_word(red);
hgreen = get_fs_word(green);
hblue = get_fs_word(blue);
htransp = transp ? get_fs_word(transp) : 0;
get_user(hred, red);
get_user(hgreen, green);
get_user(hblue, blue);
if (transp)
get_user(htransp, transp);
else
htransp = 0;
}
hred = CNVT_TOHW(hred, var->red.length);
hgreen = CNVT_TOHW(hgreen, var->green.length);
......@@ -2119,10 +2122,10 @@ static void memcpy_fs(int fsfromto, void *to, void *from, int len)
memcpy(to, from, len);
return;
case 1:
memcpy_fromfs(to, from, len);
copy_from_user(to, from, len);
return;
case 2:
memcpy_tofs(to, from, len);
copy_to_user(to, from, len);
return;
}
}
......@@ -2256,7 +2259,7 @@ static void amifb_interrupt(int irq, void *dev_id, struct pt_regs *fp)
}
/*
* Get a Video Modes
* Get a Video Mode
*/
static void get_video_mode(const char *name)
......@@ -3212,7 +3215,7 @@ static int ami_get_var_cursorinfo(struct fb_var_cursorinfo *var, u_char *data, i
"clrb %0 ; swap %1 ; lslw #1,%1 ; roxlb #1,%0 ; "
"swap %1 ; lslw #1,%1 ; roxlb #1,%0"
: "=d" (color), "=d" (datawords) : "1" (datawords));
put_fs_byte(color, data++);
put_user(color, data++);
}
if (bits > 0) {
--words; ++lspr;
......@@ -3269,10 +3272,14 @@ static int ami_set_var_cursorinfo(struct fb_var_cursorinfo *var, u_char *data, i
for (height = (short)var->height-1; height >= 0; height--) {
bits = 16; words = delta; datawords = 0;
for (width = (short)var->width-1; width >= 0; width--) {
unsigned long tdata = 0;
get_user(tdata, (char *)data);
data++;
asm volatile (
"lsrb #1,%2 ; roxlw #1,%0 ; swap %0 ; "
"lsrb #1,%2 ; roxlw #1,%0 ; swap %0"
: "=d" (datawords) : "0" (datawords), "d" ((u_long)(get_fs_byte(data++))));
: "=d" (datawords)
: "0" (datawords), "d" (tdata));
if (--bits == 0) {
bits = 16; --words;
asm volatile ("swap %2 ; movew %2,%0@(%3:w:2) ; swap %2 ; movew %2,%0@+"
......
arch/m68k/amiga/amiints.c
View file @ 832c29d4
......@@ -209,7 +209,7 @@ int amiga_request_irq(unsigned int irq, void (*handler)(int, void *, struct pt_r
}
/* enable the interrupt */
if (irq < IRQ_IDX(IRQ_AMIGA_PORTS))
if (irq < IRQ_IDX(IRQ_AMIGA_PORTS) && !ami_ablecount[irq])
custom.intena = IF_SETCLR | ami_intena_vals[irq];
return 0;
......@@ -264,7 +264,7 @@ void amiga_enable_irq(unsigned int irq)
return;
}
if (ami_ablecount[irq]++)
if (--ami_ablecount[irq])
return;
if (irq >= IRQ_IDX(IRQ_AMIGA_CIAB)) {
......@@ -290,7 +290,7 @@ void amiga_disable_irq(unsigned int irq)
return;
}
if (--ami_ablecount[irq])
if (ami_ablecount[irq]++)
return;
if (irq >= IRQ_IDX(IRQ_AMIGA_CIAB)) {
......
arch/m68k/amiga/cia.c
View file @ 832c29d4
......@@ -55,7 +55,7 @@ unsigned char cia_set_irq(struct ciabase *base, unsigned char mask)
base->icr_data &= ~mask;
if (base->icr_data & base->icr_mask)
custom.intreq = IF_SETCLR | base->int_mask;
return (old & base->icr_mask);
return old & base->icr_mask;
}
/*
......@@ -77,12 +77,14 @@ unsigned char cia_able_irq(struct ciabase *base, unsigned char mask)
base->icr_mask &= ~mask;
base->icr_mask &= CIA_ICR_ALL;
for (i = 0, tmp = 1; i < CIA_IRQS; i++, tmp <<= 1) {
if ((tmp & base->icr_mask) && !base->irq_list[i].handler)
if ((tmp & base->icr_mask) && !base->irq_list[i].handler) {
base->icr_mask &= ~tmp;
}
base->cia->icr = tmp;
}
}
if (base->icr_data & base->icr_mask)
custom.intreq = IF_SETCLR | base->int_mask;
return (old);
return old;
}
int cia_request_irq(struct ciabase *base, unsigned int irq,
......
arch/m68k/amiga/config.c
View file @ 832c29d4
......@@ -271,23 +271,21 @@ void config_amiga(void)
mach_gettimeoffset = amiga_gettimeoffset;
if (AMIGAHW_PRESENT(A3000_CLK)){
mach_gettod = a3000_gettod;
mach_max_dma_address = 0xffffffff; /*
* default MAX_DMA 0xffffffff
* on Z3 machines - we should
* consider adding something
* like a dma_mask in kmalloc
* later on, so people using Z2
* boards in Z3 machines won't
* get into trouble - Jes
*/
}
else{ /* if (AMIGAHW_PRESENT(A2000_CLK)) */
mach_gettod = a2000_gettod;
mach_max_dma_address = 0x00ffffff; /*
* default MAX_DMA 0x00ffffff
* on Z2 machines.
*/
}
mach_max_dma_address = 0xffffffff; /*
* default MAX_DMA=0xffffffff
* on all machines. If we don't
* do so, the SCSI code will not
* be able to allocate any mem
* for transfers, unless we are
* dealing with a Z2 mem only
* system. /Jes
*/
mach_hwclk = amiga_hwclk;
mach_set_clock_mmss = amiga_set_clock_mmss;
mach_mksound = amiga_mksound;
......@@ -421,7 +419,7 @@ void a2000_gettod (int *yearp, int *monp, int *dayp,
*yearp = tod->year1 * 10 + tod->year2;
if (!(tod->cntrl3 & TOD2000_CNTRL3_24HMODE))
if ((!tod->hour1 & TOD2000_HOUR1_PM) && *hourp == 12)
if (!(tod->hour1 & TOD2000_HOUR1_PM) && *hourp == 12)
*hourp = 0;
else if ((tod->hour1 & TOD2000_HOUR1_PM) && *hourp != 12)
*hourp += 12;
......@@ -480,7 +478,7 @@ int amiga_hwclk(int op, struct hwclk_time *t)
t->year = tod->year1 * 10 + tod->year2;
if (!(tod->cntrl3 & TOD2000_CNTRL3_24HMODE))
if ((!tod->hour1 & TOD2000_HOUR1_PM) && t->hour == 12)
if (!(tod->hour1 & TOD2000_HOUR1_PM) && t->hour == 12)
t->hour = 0;
else if ((tod->hour1 & TOD2000_HOUR1_PM) && t->hour != 12)
t->hour += 12;
......
arch/m68k/amiga/cyberfb.c
View file @ 832c29d4
......@@ -29,7 +29,7 @@
#include <linux/tty.h>
#include <linux/malloc.h>
#include <linux/delay.h>
#include <asm/segment.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/zorro.h>
......@@ -815,11 +815,11 @@ static int do_fb_get_cmap(struct fb_cmap *cmap, struct fb_var_screeninfo *var,
if (transp)
*transp = htransp;
} else {
put_fs_word(hred, red);
put_fs_word(hgreen, green);
put_fs_word(hblue, blue);
put_user(hred, red);
put_user(hgreen, green);
put_user(hblue, blue);
if (transp)
put_fs_word(htransp, transp);
put_user(htransp, transp);
}
red++;
green++;
......@@ -853,10 +853,13 @@ static int do_fb_set_cmap(struct fb_cmap *cmap, struct fb_var_screeninfo *var,
hblue = *blue;
htransp = transp ? *transp : 0;
} else {
hred = get_fs_word(red);
hgreen = get_fs_word(green);
hblue = get_fs_word(blue);
htransp = transp ? get_fs_word(transp) : 0;
get_user(hred, red);
get_user(hgreen, green);
get_user(hblue, blue);
if (transp)
get_user(htransp, transp);
else
htransp = 0;
}
hred = CNVT_TOHW(hred, var->red.length);
hgreen = CNVT_TOHW(hgreen, var->green.length);
......
arch/m68k/amiga/ksyms.c
View file @ 832c29d4
......@@ -2,6 +2,10 @@
#include <asm/zorro.h>
#include <asm/amigatypes.h>
#include <asm/amigahw.h>
#include <asm/amigatypes.h>
extern volatile u_short amiga_audio_min_period;
extern u_short amiga_audio_period;
static struct symbol_table mach_amiga_symbol_table = {
#include <linux/symtab_begin.h>
......@@ -13,6 +17,8 @@ static struct symbol_table mach_amiga_symbol_table = {
X(amiga_chip_alloc),
X(amiga_chip_free),
X(amiga_chip_avail),
X(amiga_audio_period),
X(amiga_audio_min_period),
X(zorro_find),
X(zorro_get_board),
......
arch/m68k/amiga/zorro.c
View file @ 832c29d4
......@@ -477,7 +477,7 @@ BEGIN_PROD(PHASE5)
PROD("Blizzard 1230-III Turbo Board", BLIZZARD_1230_III)
PROD("Blizzard 1230-IV/1260 Turbo Board", BLIZZARD_1230_IV)
PROD("Blizzard 2060 SCSI Controller", BLIZZARD_2060SCSI)
PROD("CyberStorm", CYBERSTORM)
PROD("CyberStorm Mk II", CYBERSTORM_II)
PROD("CyberVision64 Graphics Board", CYBERVISION)
END
......
arch/m68k/atari/atafb.c
View file @ 832c29d4
This diff is collapsed.
arch/m68k/atari/ataints.c
View file @ 832c29d4
......@@ -626,7 +626,7 @@ int atari_get_irq_list(char *buf)
for( p = (irq_node_t *)irq_handler[i].dev_id; p; p = p->next ) {
len += sprintf(buf+len, "%s\n", p->devname);
if (p->next)
len += sprintf( buf+len, " " );
len += sprintf( buf+len, " " );
}
}
}
......
arch/m68k/atari/config.c
View file @ 832c29d4
......@@ -514,7 +514,7 @@ mste_write(struct MSTE_RTC *val)
void atari_mste_gettod (int *yearp, int *monp, int *dayp,
int *hourp, int *minp, int *secp)
{
int hr24=0;
int hr24=0, hour;
struct MSTE_RTC val;
mste_rtc.mode=(mste_rtc.mode | 1);
......@@ -524,13 +524,14 @@ void atari_mste_gettod (int *yearp, int *monp, int *dayp,
mste_read(&val);
*secp = val.sec_ones + val.sec_tens * 10;
*minp = val.min_ones + val.min_tens * 10;
if (hr24)
*hourp = val.hr_ones + val.hr_tens * 10;
else {
*hourp = val.hr_ones + (val.hr_tens & 1) * 10;
if (val.hr_tens & 2)
*hourp += 12;
hour = val.hr_ones + val.hr_tens * 10;
if (!hr24) {
if (hour == 12 || hour == 12 + 20)
hour -= 12;
if (hour >= 20)
hour += 12 - 20;
}
*hourp = hour;
*dayp = val.day_ones + val.day_tens * 10;
*monp = val.mon_ones + val.mon_tens * 10;
*yearp = val.year_ones + val.year_tens * 10 + 80;
......@@ -542,33 +543,38 @@ void atari_gettod (int *yearp, int *monp, int *dayp,
{
unsigned char ctrl;
unsigned short tos_version;
int hour, pm;
while (!(RTC_READ(RTC_FREQ_SELECT) & RTC_UIP)) ;
while (RTC_READ(RTC_FREQ_SELECT) & RTC_UIP) ;
*secp = RTC_READ(RTC_SECONDS);
*minp = RTC_READ(RTC_MINUTES);
*hourp = RTC_READ(RTC_HOURS);
hour = RTC_READ(RTC_HOURS);
*dayp = RTC_READ(RTC_DAY_OF_MONTH);
*monp = RTC_READ(RTC_MONTH);
*yearp = RTC_READ(RTC_YEAR);
pm = hour & 0x80;
hour &= ~0x80;
ctrl = RTC_READ(RTC_CONTROL);
if (!(ctrl & RTC_DM_BINARY)) {
BCD_TO_BIN(*secp);
BCD_TO_BIN(*minp);
BCD_TO_BIN(*hourp);
BCD_TO_BIN(hour);
BCD_TO_BIN(*dayp);
BCD_TO_BIN(*monp);
BCD_TO_BIN(*yearp);
}
if (!(ctrl & RTC_24H)) {
if (*hourp & 0x80) {
*hourp &= ~0x80;
*hourp += 12;
}
if (!pm && hour == 12)
hour = 0;
else if (pm && hour != 12)
hour += 12;
}
*hourp = hour;
/* Adjust values (let the setup valid) */
/* Fetch tos version at Physical 2 */
......@@ -603,13 +609,14 @@ int atari_mste_hwclk( int op, struct hwclk_time *t )
val.min_ones = t->min % 10;
val.min_tens = t->min / 10;
hour = t->hour;
if (!hr24) {
if (hour > 11)
hour += 20 - 12;
if (hour == 0 || hour == 20)
hour += 12;
}
val.hr_ones = hour % 10;
val.hr_tens = hour / 10;
if (!hr24 && hour > 11) {
hour -= 12;
val.hr_ones = hour % 10;
val.hr_tens = (hour / 10) | 2;
}
val.day_ones = t->day % 10;
val.day_tens = t->day / 10;
val.mon_ones = (t->mon+1) % 10;
......@@ -627,13 +634,14 @@ int atari_mste_hwclk( int op, struct hwclk_time *t )
mste_read(&val);
t->sec = val.sec_ones + val.sec_tens * 10;
t->min = val.min_ones + val.min_tens * 10;
if (hr24)
t->hour = val.hr_ones + val.hr_tens * 10;
else {
t->hour = val.hr_ones + (val.hr_tens & 1) * 10;
if (val.hr_tens & 2)
t->hour += 12;
hour = val.hr_ones + val.hr_tens * 10;
if (!hr24) {
if (hour == 12 || hour == 12 + 20)
hour -= 12;
if (hour >= 20)
hour += 12 - 20;
}
t->hour = hour;
t->day = val.day_ones + val.day_tens * 10;
t->mon = val.mon_ones + val.mon_tens * 10 - 1;
t->year = val.year_ones + val.year_tens * 10 + 80;
......@@ -648,6 +656,7 @@ int atari_hwclk( int op, struct hwclk_time *t )
unsigned long flags;
unsigned short tos_version;
unsigned char ctrl;
int pm = 0;
/* Tos version at Physical 2. See above for explanation why we
cannot use PTOV(2). */
......@@ -667,9 +676,14 @@ int atari_hwclk( int op, struct hwclk_time *t )
year = t->year - ((tos_version < 0x306) ? 70 : 68);
wday = t->wday + (t->wday >= 0);
if (!(ctrl & RTC_24H) && hour > 11) {
hour -= 12;
hour |= 0x80;
if (!(ctrl & RTC_24H)) {
if (hour > 11) {
pm = 0x80;
if (hour != 12)
hour -= 12;
}
else if (hour == 0)
hour = 12;
}
if (!(ctrl & RTC_DM_BINARY)) {
......@@ -716,7 +730,7 @@ int atari_hwclk( int op, struct hwclk_time *t )
else {
RTC_WRITE( RTC_SECONDS, sec );
RTC_WRITE( RTC_MINUTES, min );
RTC_WRITE( RTC_HOURS, hour );
RTC_WRITE( RTC_HOURS, hour + pm);
RTC_WRITE( RTC_DAY_OF_MONTH, day );
RTC_WRITE( RTC_MONTH, mon );
RTC_WRITE( RTC_YEAR, year );
......@@ -728,7 +742,12 @@ int atari_hwclk( int op, struct hwclk_time *t )
if (!op) {
/* read: adjust values */
if (!(ctrl & RTC_DM_BINARY)) {
if (hour & 0x80) {
hour &= ~0x80;
pm = 1;
}
if (!(ctrl & RTC_DM_BINARY)) {
BCD_TO_BIN(sec);
BCD_TO_BIN(min);
BCD_TO_BIN(hour);
......@@ -739,10 +758,10 @@ int atari_hwclk( int op, struct hwclk_time *t )
}
if (!(ctrl & RTC_24H)) {
if (hour & 0x80) {
hour &= ~0x80;
hour += 12;
}
if (!pm && hour == 12)
hour = 0;
else if (pm && hour != 12)
hour += 12;
}
t->sec = sec;
......
arch/m68k/atari/joystick.c
View file @ 832c29d4
......@@ -14,7 +14,7 @@
#include <asm/atarikb.h>
#include <asm/atari_joystick.h>
#include <asm/atari_mouse.h>
#include <asm/segment.h>
#include <asm/uaccess.h>
#define MAJOR_NR JOYSTICK_MAJOR
......@@ -79,14 +79,14 @@ static int open_joystick(struct inode *inode, struct file *file)
return 0;
}
static int write_joystick(struct inode *inode, struct file *file,
const char *buffer, int count)
static long write_joystick(struct inode *inode, struct file *file,
const char *buffer, unsigned long count)
{
return -EINVAL;
}
static int read_joystick(struct inode *inode, struct file *file,
char *buffer, int count)
static long read_joystick(struct inode *inode, struct file *file,
char *buffer, unsigned long count)
{
int minor = DEVICE_NR(inode->i_rdev);
int i;
......
arch/m68k/atari/ksyms.c
View file @ 832c29d4
......@@ -7,6 +7,8 @@
#include <asm/atari_joystick.h>
#include <asm/atari_stdma.h>
extern void atari_microwire_cmd( int cmd );
static struct symbol_table mach_atari_symbol_table = {
#include <linux/symtab_begin.h>
......@@ -27,6 +29,8 @@ static struct symbol_table mach_atari_symbol_table = {
X(ikbd_mouse_rel_pos),
X(ikbd_mouse_disable),
X(atari_microwire_cmd),
#include <linux/symtab_end.h>
};
......
arch/m68k/config.in
View file @ 832c29d4
......@@ -29,12 +29,14 @@ comment 'Processor type'
bool '68020 support' CONFIG_M68020
bool '68030 support' CONFIG_M68030
bool '68040 support' CONFIG_M68040
if [ "$CONFIG_M68040" = "y" ]; then
bool 'Use 68040 specific optimizations' CONFIG_OPTIMIZE_040
fi
bool '68060 support' CONFIG_M68060
if [ "$CONFIG_M68060" = "y" ]; then
bool 'Use 68060 specific optimizations' CONFIG_OPTIMIZE_060
if [ "$CONFIG_M68020" = "n" -a "$CONFIG_M68030" = "n" ]; then
if [ "$CONFIG_M68040" = "y" -a "$CONFIG_M68060" = "n" ]; then
bool 'Use 68040 specific optimizations' CONFIG_OPTIMIZE_040
fi
if [ "$CONFIG_M68040" = "n" -a "$CONFIG_M68060" = "y" ]; then
bool 'Use 68060 specific optimizations' CONFIG_OPTIMIZE_060
fi
fi
bool 'Advanced processor options' CONFIG_ADVANCED_CPU
if [ "$CONFIG_ADVANCED_CPU" = "y" ]; then
......@@ -56,11 +58,11 @@ if [ "$CONFIG_AMIGA" = "y" ]; then
bool 'Amiga ECS chipset support' CONFIG_AMIFB_ECS
bool 'Amiga AGA chipset support' CONFIG_AMIFB_AGA
bool 'Amiga Cybervision support' CONFIG_FB_CYBER
bool 'Amiga GSP (TMS340x0) support' CONFIG_AMIGA_GSP
if [ "$CONFIG_AMIGA_GSP" = "y" ]; then
bool 'DMI Resolver support' CONFIG_GSP_RESOLVER
# bool 'Amiga GSP (TMS340x0) support' CONFIG_AMIGA_GSP
# if [ "$CONFIG_AMIGA_GSP" = "y" ]; then
# bool 'DMI Resolver support' CONFIG_GSP_RESOLVER
# bool 'A2410 support' CONFIG_GSP_A2410
fi
# fi
fi
endmenu
......@@ -82,11 +84,11 @@ if [ "$CONFIG_AMIGA" = "y" ]; then
tristate 'Amiga Zorro II ramdisk support' CONFIG_AMIGA_Z2RAM
fi
if [ "$CONFIG_ATARI" = "y" ]; then
bool 'Atari ACSI support' CONFIG_ATARI_ACSI
if [ "$CONFIG_ATARI_ACSI" = "y" ]; then
tristate 'Atari ACSI support' CONFIG_ATARI_ACSI
if [ "$CONFIG_ATARI_ACSI" != "n" ]; then
comment 'Some devices (e.g. CD jukebox) support multiple LUNs'
bool 'Probe all LUNs on each ACSI device' CONFIG_ACSI_MULTI_LUN
bool 'Atari SLM laser printer support' CONFIG_ATARI_SLM
dep_tristate 'Atari SLM laser printer support' CONFIG_ATARI_SLM $CONFIG_ATARI_ACSI
fi
fi
......@@ -132,10 +134,13 @@ mainmenu_option next_comment
comment 'SCSI low-level drivers'
if [ "$CONFIG_AMIGA" = "y" ]; then
bool 'A3000 WD33C93A support' CONFIG_A3000_SCSI
bool 'A2091 WD33C93A support' CONFIG_A2091_SCSI
bool 'GVP Series II WD33C93A support' CONFIG_GVP11_SCSI
tristate 'A3000 WD33C93A support' CONFIG_A3000_SCSI
tristate 'A2091 WD33C93A support' CONFIG_A2091_SCSI
tristate 'GVP Series II WD33C93A support' CONFIG_GVP11_SCSI
bool 'CyberStorm SCSI support' CONFIG_CYBERSTORM_SCSI
bool 'CyberStorm SCSI Mk II support' CONFIG_CYBERSTORMII_SCSI
bool 'Blizzard 2060 SCSI support' CONFIG_BLZ2060_SCSI
bool 'Blizzard 1230IV/1260 SCSI support' CONFIG_BLZ1230_SCSI
fi
if [ "$CONFIG_ATARI" = "y" ]; then
dep_tristate 'Atari native SCSI support' CONFIG_ATARI_SCSI $CONFIG_SCSI
......@@ -191,8 +196,9 @@ source fs/Config.in
mainmenu_option next_comment
comment 'Character devices'
bool 'Parallel printer support' CONFIG_PRINTER
tristate 'Parallel printer support' CONFIG_PRINTER
if [ "$CONFIG_AMIGA" = "y" ]; then
dep_tristate 'Multiface Card III parallel support' CONFIG_MULTIFACE_III_LP $CONFIG_PRINTER
tristate 'Amiga mouse support' CONFIG_AMIGAMOUSE
fi
if [ "$CONFIG_ATARI" = "y" ]; then
......@@ -220,9 +226,9 @@ endmenu
mainmenu_option next_comment
comment 'Sound support'
bool 'Sound support' CONFIG_SOUND y
tristate 'Sound support' CONFIG_SOUND
if [ "$CONFIG_SOUND" != "n" ]; then
bool 'Amiga or Atari DMA sound support' CONFIG_DMASOUND y
dep_tristate 'Amiga or Atari DMA sound support' CONFIG_DMASOUND $CONFIG_SOUND
fi
endmenu
......
arch/m68k/console/fbcon.c
View file @ 832c29d4
......@@ -67,6 +67,7 @@
#include <asm/machdep.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include "../../../drivers/char/vt_kern.h" /* vt_cons and vc_resize_con() */
......@@ -244,7 +245,7 @@ static int fbcon_blank(int blank);
* Internal routines
*/
static void fbcon_setup(int con, int setcol, int cls);
static void fbcon_setup(int con, int setcol, int init);
static __inline__ void *mymemclear_small(void *s, size_t count);
static __inline__ void *mymemclear(void *s, size_t count);
static __inline__ void *mymemset(void *s, size_t count);
......@@ -547,7 +548,7 @@ static void fbcon_init(struct vc_data *conp)
if (unit)
disp[unit] = disp[0];
disp[unit].conp = conp;
fbcon_setup(unit, 1, 0);
fbcon_setup(unit, 1, 1);
}
......@@ -560,15 +561,16 @@ static int fbcon_deinit(struct vc_data *conp)
static int fbcon_changevar(int con)
{
fbcon_setup(con, 1, 1);
fbcon_setup(con, 1, 0);
return(0);
}
static void fbcon_setup(int con, int setcol, int cls)
static void fbcon_setup(int con, int setcol, int init)
{
struct display *p = &disp[con];
struct vc_data *conp = p->conp;
int nr_rows, nr_cols;
p->var.xoffset = p->var.yoffset = p->yscroll = 0; /* reset wrap/pan */
......@@ -588,8 +590,15 @@ static void fbcon_setup(int con, int setcol, int cls)
else
p->scrollmode = SCROLL_YMOVE;
conp->vc_cols = p->var.xres/p->fontwidth;
conp->vc_rows = p->var.yres/p->fontheight;
nr_cols = p->var.xres/p->fontwidth;
nr_rows = p->var.yres/p->fontheight;
/* ++guenther: console.c:vc_allocate() relies on initializing vc_{cols,rows},
* but we must not set those if we are only resizing the console.
*/
if (init) {
conp->vc_cols = nr_cols;
conp->vc_rows = nr_rows;
}
p->vrows = p->var.yres_virtual/p->fontheight;
conp->vc_can_do_color = p->var.bits_per_pixel != 1;
......@@ -701,8 +710,8 @@ static void fbcon_setup(int con, int setcol, int cls)
p->bgcol = 0;
}
if (cls)
vc_resize_con(conp->vc_rows, conp->vc_cols, con);
if (!init)
vc_resize_con(nr_rows, nr_cols, con);
}
......@@ -1467,6 +1476,10 @@ static int fbcon_cursor(struct vc_data *conp, int mode)
int unit = conp->vc_num;
struct display *p = &disp[unit];
/* Avoid flickering if there's no real change. */
if (p->cursor_x == conp->vc_x && p->cursor_y == conp->vc_y &&
(mode == CM_ERASE) == !cursor_on)
return 0;
if (CURSOR_UNDRAWN ())
p->dispsw->rev_char(p, p->cursor_x, real_y(p, p->cursor_y));
p->cursor_x = conp->vc_x;
......@@ -1752,7 +1765,7 @@ static int fbcon_set_font(struct vc_data *conp, int w, int h, char *data)
if ((i = verify_area( VERIFY_READ, (void *)data, MAX_FONT_NAME )))
return i;
memcpy_fromfs( name, data, MAX_FONT_NAME );
copy_from_user( name, data, MAX_FONT_NAME );
name[sizeof(name)-1] = 0;
if (!findsoftfont( name, &w, &h, (u_char **)&data ))
......
arch/m68k/defconfig
View file @ 832c29d4
......@@ -27,8 +27,8 @@ CONFIG_AMIGA=y
CONFIG_M68020=y
CONFIG_M68030=y
CONFIG_M68040=y
# CONFIG_OPTIMIZE_040 is not set
# CONFIG_M68060 is not set
# CONFIG_OPTIMIZE_040 is not set
# CONFIG_OPTIMIZE_060 is not set
# CONFIG_ADVANCED_CPU is not set
# CONFIG_RMW_INSNS is not set
......@@ -56,6 +56,10 @@ CONFIG_AMIFB_AGA=y
CONFIG_BLK_DEV_FD=y
# CONFIG_BLK_DEV_LOOP is not set
# CONFIG_BLK_DEV_IDE is not set
# CONFIG_BLK_DEV_IDEDISK is not set
# CONFIG_BLK_DEV_IDECD is not set
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
# CONFIG_AMIGA_Z2RAM is not set
# CONFIG_ATARI_ACSI is not set
# CONFIG_ACSI_MULTI_LUN is not set
......@@ -87,6 +91,7 @@ CONFIG_INET=y
# CONFIG_TCP_NAGLE_OFF is not set
CONFIG_IP_NOSR=y
# CONFIG_SKB_LARGE is not set
# CONFIG_IPV6 is not set
#
#
......@@ -122,7 +127,10 @@ CONFIG_A3000_SCSI=y
# CONFIG_A2091_SCSI is not set
# CONFIG_GVP11_SCSI is not set
# CONFIG_CYBERSTORM_SCSI is not set
# CONFIG_ATARI_SCSI is not set
# CONFIG_CYBERSTORMII_SCSI is not set
# CONFIG_BLZ2060_SCSI is not set
# CONFIG_BLZ1230_SCSI is not set
CONFIG_ATARI_SCSI=y
#
# Network device support
......@@ -142,7 +150,6 @@ CONFIG_A3000_SCSI=y
# Filesystems
#
# CONFIG_QUOTA is not set
# CONFIG_LOCK_MANDATORY is not set
CONFIG_MINIX_FS=y
# CONFIG_EXT_FS is not set
CONFIG_EXT2_FS=y
......@@ -151,6 +158,7 @@ CONFIG_FAT_FS=y
CONFIG_MSDOS_FS=y
# CONFIG_VFAT_FS is not set
# CONFIG_UMSDOS_FS is not set
# CONFIG_MSDOS_PARTITION is not set
CONFIG_PROC_FS=y
CONFIG_NFS_FS=y
# CONFIG_ROOT_NFS is not set
......@@ -166,7 +174,7 @@ CONFIG_NFS_FS=y
#
# CONFIG_PRINTER is not set
CONFIG_AMIGAMOUSE=y
# CONFIG_ATARIMOUSE is not set
CONFIG_ATARIMOUSE=y
CONFIG_AMIGA_BUILTIN_SERIAL=y
# CONFIG_GVPIOEXT is not set
# CONFIG_MULTIFACE_III_TTY is not set
......
arch/m68k/kernel/console.c
View file @ 832c29d4
......@@ -119,7 +119,7 @@
#include <linux/ioport.h>
#include <asm/io.h>
#include <asm/segment.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/bitops.h>
......@@ -1134,7 +1134,7 @@ static void set_mode(int currcons, int on_off)
if (on_off)
set_kbd(decckm);
else
clr_kbd(decckm);
clr_kbd(decckm);
break;
case 3: /* 80/132 mode switch unimplemented */
deccolm = on_off;
......@@ -1371,7 +1371,7 @@ static void restore_cur(int currcons)
need_wrap = 0;
}
enum { ESnormal, ESesc, ESsquare, ESgetpars, ESgotpars, ESfunckey,
enum { ESnormal, ESesc, ESsquare, ESgetpars, ESgotpars, ESfunckey,
EShash, ESsetG0, ESsetG1, ESpercent, ESignore, ESnonstd,
ESpalette };
......@@ -1457,8 +1457,18 @@ static void con_start(struct tty_struct *tty)
set_leds();
}
static int con_write(struct tty_struct * tty, int from_user,
const unsigned char *buf, int count)
static void con_flush_chars(struct tty_struct *tty)
{
unsigned int currcons;
struct vt_struct *vt = (struct vt_struct *)tty->driver_data;
currcons = vt->vc_num;
if (vcmode != KD_GRAPHICS)
set_cursor(currcons);
}
static int do_con_write(struct tty_struct * tty, int from_user,
const unsigned char *buf, int count)
{
int c, tc, ok, n = 0;
unsigned int currcons;
......@@ -1486,7 +1496,10 @@ static int con_write(struct tty_struct * tty, int from_user,
disable_bh(CONSOLE_BH);
while (count) {
enable_bh(CONSOLE_BH);
c = from_user ? get_user(buf) : *buf;
if (from_user)
get_user(c, buf);
else
c = *buf;
buf++; n++; count--;
disable_bh(CONSOLE_BH);
......@@ -1541,7 +1554,8 @@ static int con_write(struct tty_struct * tty, int from_user,
ok = tc && (c >= 32 ||
(!utf && !(((disp_ctrl ? CTRL_ALWAYS
: CTRL_ACTION) >> c) & 1)))
&& (c != 127 || disp_ctrl);
&& (c != 127 || disp_ctrl)
&& (c != 128+27);
if (vc_state == ESnormal && ok) {
/* Now try to find out how to display it */
......@@ -1561,7 +1575,7 @@ static int con_write(struct tty_struct * tty, int from_user,
cr(currcons);
lf(currcons);
}
#if 1 /* XXX */
/* DPC: 1994-04-12
* Speed up overstrike mode, using new putcs.
......@@ -1581,7 +1595,7 @@ static int con_write(struct tty_struct * tty, int from_user,
*p++ = tc;
*pos++ = tc | (attr << 8);
if (nextx == cols) {
sw->con_putc(vc_cons[currcons].d,
*putcs_buf, y, x);
......@@ -1591,11 +1605,14 @@ static int con_write(struct tty_struct * tty, int from_user,
}
/* TAB TAB TAB - Arghh!!!! */
while (count)
{
enable_bh(CONSOLE_BH);
c = from_user ? get_user(buf) : *buf;
if (from_user)
get_user(c, buf);
else
c = *buf;
disable_bh(CONSOLE_BH);
tc = translate[toggle_meta ? (c|0x80) : c];
if (!tc ||
......@@ -1655,6 +1672,8 @@ static int con_write(struct tty_struct * tty, int from_user,
* of an escape sequence.
*/
switch (c) {
case 0:
continue;
case 7:
if (bell_duration)
kd_mksound(bell_pitch, bell_duration);
......@@ -2000,12 +2019,26 @@ static int con_write(struct tty_struct * tty, int from_user,
vc_state = ESnormal;
}
}
if (vcmode != KD_GRAPHICS)
set_cursor(currcons);
enable_bh(CONSOLE_BH);
return n;
}
static int con_write(struct tty_struct * tty, int from_user,
const unsigned char *buf, int count)
{
int retval;
retval = do_con_write(tty, from_user, buf, count);
con_flush_chars(tty);
return retval;
}
static void con_put_char(struct tty_struct *tty, unsigned char ch)
{
do_con_write(tty, 0, &ch, 1);
}
static int con_write_room(struct tty_struct *tty)
{
if (tty->stopped)
......@@ -2208,6 +2241,8 @@ unsigned long con_init(unsigned long kmem_start)
console_driver.open = con_open;
console_driver.write = con_write;
console_driver.write_room = con_write_room;
console_driver.put_char = con_put_char;
console_driver.flush_chars = con_flush_chars;
console_driver.chars_in_buffer = con_chars_in_buffer;
console_driver.ioctl = vt_ioctl;
console_driver.stop = con_stop;
......@@ -2474,12 +2509,7 @@ static int set_get_font(char * arg, int set, int ch512)
int i, unit, size;
char *charmap;
if (arg){
i = verify_area(set ? VERIFY_READ : VERIFY_WRITE,
(void *)arg, ch512 ? 2*cmapsz : cmapsz);
if (i)
return i;
}else
if (!arg)
return -EINVAL;
......@@ -2488,7 +2518,10 @@ static int set_get_font(char * arg, int set, int ch512)
charmap = (char *)kmalloc(size, GFP_USER);
if (set){
memcpy_fromfs(charmap, arg, size);
if (copy_from_user(charmap, arg, size)) {
kfree(charmap);
return -EFAULT;
}
for (unit = 32; unit > 0; unit--)
for (i = 0; i < (ch512 ? 512 : 256); i++)
......@@ -2501,7 +2534,8 @@ static int set_get_font(char * arg, int set, int ch512)
memset(charmap, 0, size);
i = conswitchp->con_get_font(vc_cons[fg_console].d,
&unit, &unit, charmap);
memcpy_tofs(arg, charmap, size);
if (i == 0 && copy_to_user(arg, charmap, size))
i = -EFAULT;
}
kfree(charmap);
......@@ -2572,7 +2606,8 @@ int con_adjust_height(unsigned long fontheight)
void set_vesa_blanking(int arg)
{
char *argp = (char *)arg + 1;
unsigned int mode = get_fs_byte(argp);
unsigned int mode;
get_user(mode, argp);
vesa_blank_mode = (mode < 4) ? mode : 0;
}
......
arch/m68k/kernel/entry.S
View file @ 832c29d4
......@@ -319,8 +319,8 @@ LTSS_KSP = 0
LTSS_USP = 4
LTSS_SR = 8
LTSS_FS = 10
LTSS_CRP = 20
LTSS_FPCTXT = 32
LTSS_CRP = 12
LTSS_FPCTXT = 24
SYMBOL_NAME_LABEL(resume)
/*
......@@ -401,7 +401,7 @@ SYMBOL_NAME_LABEL(resume)
movec %cacr,%d0
oriw #LFLUSH_I_AND_D,%d0
movec %d0,%cacr
/* switch the root pointer */
pmove %a1@(LTSS_CRP),%crp
#endif
......@@ -643,4 +643,6 @@ SYMBOL_NAME_LABEL(sys_call_table)
.long SYMBOL_NAME(sys_sched_rr_get_interval)
.long SYMBOL_NAME(sys_nanosleep)
.long SYMBOL_NAME(sys_mremap)
.space (NR_syscalls-163)*4
.long SYMBOL_NAME(sys_setresuid)
.long SYMBOL_NAME(sys_getresuid)
.space (NR_syscalls-165)*4
arch/m68k/kernel/head.S
View file @ 832c29d4
......@@ -319,7 +319,7 @@ ENTRY(_start)
lea %pc@(SYMBOL_NAME(kpt)),%a1
movel %a3,%a1@ /* save address of page table */
movel %a3,%a1
addql #_PAGE_TABLE,%a1 /* descriptor type */
addw #_PAGE_TABLE+_PAGE_ACCESSED,%a1 /* descriptor type */
movel #PAGE_TABLE_SIZE<<2,%d2 /* increment */
2: movel %a1,%a0@+
......@@ -341,7 +341,7 @@ ENTRY(_start)
movel %a3,%a0
movel %d5,%a1
addw #_PAGE_GLOBAL040+_PAGE_CACHE040+_PAGE_PRESENT,%a1
addw #_PAGE_GLOBAL040+_PAGE_CACHE040+_PAGE_PRESENT+_PAGE_ACCESSED,%a1
movew #(PAGE_TABLE_SIZE*TABLENR_4MB)-1,%d1
movel #PAGESIZE,%d2
1: movel %a1,%a0@+
......@@ -404,7 +404,7 @@ Lnot040:
putc('I')
moveq #_PAGE_NOCACHE030+_PAGE_PRESENT,%d0
movel #_PAGE_NOCACHE030+_PAGE_PRESENT+_PAGE_ACCESSED,%d0
movel %d0,%a5@(0x40<<2)
jra Lmapphys
......@@ -431,7 +431,7 @@ Lspami68040:
/* initialize the pointer table */
movel %a4,%a0
movel %a3,%a1
addql #_PAGE_TABLE,%a1 /* base descriptor */
addw #_PAGE_TABLE+_PAGE_ACCESSED,%a1 /* base descriptor */
movel #PAGE_TABLE_SIZE<<2,%d2 /* increment */
moveq #TABLENR_16MB-1,%d1
......@@ -441,7 +441,7 @@ Lspami68040:
/* ensure that the root table points to the pointer table */
movel %a4,%a0
addql #_PAGE_TABLE,%a0
addw #_PAGE_TABLE+_PAGE_ACCESSED,%a0
movel %a0,%a5@(0x40<<2)
/*
......@@ -449,7 +449,7 @@ Lspami68040:
* descriptor bits include noncachable/serialized and global bits.
*/
movel %a3,%a0
movew #_PAGE_GLOBAL040+_PAGE_NOCACHE_S+_PAGE_PRESENT,%a1
movew #_PAGE_GLOBAL040+_PAGE_NOCACHE_S+_PAGE_PRESENT+_PAGE_ACCESSED,%a1
movel #PAGESIZE,%d2
movew #(PAGE_TABLE_SIZE*TABLENR_16MB)-1,%d1
......@@ -518,7 +518,7 @@ Ltest_berr:
/* Let the root table point to the new pointer table */
lea %a4@(PTR_TABLE_SIZE<<2),%a4
movel %a4,%a0
addl #_PAGE_TABLE,%a0
addw #_PAGE_TABLE+_PAGE_ACCESSED,%a0
movel %a0,%a5@(0x7f<<2) /* 0xFE000000 - 0xFFFFFFFF */
/* clear lower half of the pointer table (0xfexxxxxx) */
......@@ -534,7 +534,7 @@ Ltest_berr:
movel #PAGE_TABLE_SIZE*PAGESIZE,%d1
movel #(PTR_TABLE_SIZE/2)-1,%d2
movel %d3,%d0
addl #_PAGE_PRESENT,%d0
orw #_PAGE_PRESENT+_PAGE_ACCESSED,%d0
1: movel %d0,%a0@+
addl %d1,%d0
dbra %d2,1b
......@@ -552,7 +552,7 @@ Lspata68040:
/* Initialize the upper half of the pointer table (a0 is still valid) */
movel %a3,%a1
addql #_PAGE_TABLE,%a1
addw #_PAGE_TABLE+_PAGE_ACCESSED,%a1
movel #PAGE_TABLE_SIZE<<2,%d2
moveq #TABLENR_16MB-1,%d1
1: movel %a1,%a0@+
......@@ -562,7 +562,7 @@ Lspata68040:
/* Initialize the page tables as noncacheable/serialized! */
movel %a3,%a0
movel %d3,%a1
addw #_PAGE_GLOBAL040+_PAGE_NOCACHE_S+_PAGE_PRESENT,%a1
addw #_PAGE_GLOBAL040+_PAGE_NOCACHE_S+_PAGE_PRESENT+_PAGE_ACCESSED,%a1
movel #PAGESIZE,%d2
movew #(PAGE_TABLE_SIZE*TABLENR_16MB)-1,%d1
1: movel %a1,%a0@+
......@@ -629,7 +629,7 @@ Lmapphys:
lsrl %d2,%d0
movel %d0,%d1
lsll %d2,%d1
addql #_PAGE_PRESENT,%d1
orw #_PAGE_PRESENT+_PAGE_ACCESSED,%d1
lsll #2,%d0
movel %a5@(%d0:w),%d2
movel %d1,%a5@(%d0:w)
......@@ -722,7 +722,7 @@ Lmapphysnotamiga:
lsrl %d0,%d1
lea %a1@(%d1:l:4),%a1
movel %d5,%d1
addql #_PAGE_PRESENT,%d1
orw #_PAGE_PRESENT+_PAGE_ACCESSED,%d1
movel %a1@,%d2
movel %d1,%a1@
lea 5f:w,%a0
......
arch/m68k/kernel/ksyms.c
View file @ 832c29d4
......@@ -40,12 +40,14 @@ static struct symbol_table arch_symbol_table = {
X(cache_clear),
X(mm_vtop),
X(mm_ptov),
X(mm_end_of_chunk),
X(m68k_debug_device),
X(request_irq),
X(free_irq),
X(dump_fpu),
X(dump_thread),
X(strnlen),
X(strrchr),
/* The following are special because they're not called
explicitly (the C compiler generates them). Fortunately,
......@@ -55,8 +57,8 @@ static struct symbol_table arch_symbol_table = {
XNOVERS(memcpy),
XNOVERS(memset),
XNOVERS(down_failed),
XNOVERS(up_wakeup),
XNOVERS(__down_failed),
XNOVERS(__up_wakeup),
#include <linux/symtab_end.h>
};
......
arch/m68k/kernel/process.c
View file @ 832c29d4
......@@ -21,7 +21,7 @@
#include <linux/user.h>
#include <linux/a.out.h>
#include <asm/segment.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/traps.h>
#include <asm/machdep.h>
......@@ -172,6 +172,8 @@ int dump_fpu (struct user_m68kfp_struct *fpu)
*/
void dump_thread(struct pt_regs * regs, struct user * dump)
{
struct switch_stack *sw;
/* changed the size calculations - should hopefully work better. lbt */
dump->magic = CMAGIC;
dump->start_code = 0;
......@@ -186,8 +188,27 @@ void dump_thread(struct pt_regs * regs, struct user * dump)
dump->u_ssize = ((unsigned long) (TASK_SIZE - dump->start_stack)) >> PAGE_SHIFT;
dump->u_ar0 = (struct pt_regs *)(((int)(&dump->regs)) -((int)(dump)));
dump->regs = *regs;
dump->regs2 = ((struct switch_stack *)regs)[-1];
sw = ((struct switch_stack *)regs) - 1;
dump->regs.d1 = regs->d1;
dump->regs.d2 = regs->d2;
dump->regs.d3 = regs->d3;
dump->regs.d4 = regs->d4;
dump->regs.d5 = regs->d5;
dump->regs.d6 = sw->d6;
dump->regs.d7 = sw->d7;
dump->regs.a0 = regs->a0;
dump->regs.a1 = regs->a1;
dump->regs.a2 = sw->a2;
dump->regs.a3 = sw->a3;
dump->regs.a4 = sw->a4;
dump->regs.a5 = sw->a5;
dump->regs.a6 = sw->a6;
dump->regs.d0 = regs->d0;
dump->regs.orig_d0 = regs->orig_d0;
dump->regs.stkadj = regs->stkadj;
dump->regs.sr = regs->sr;
dump->regs.pc = regs->pc;
dump->regs.fmtvec = (regs->format << 12) | regs->vector;
/* dump floating point stuff */
dump->u_fpvalid = dump_fpu (&dump->m68kfp);
}
......
arch/m68k/kernel/ptrace.c
View file @ 832c29d4
......@@ -18,7 +18,7 @@
#include <linux/ptrace.h>
#include <linux/user.h>
#include <asm/segment.h>
#include <asm/uaccess.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/system.h>
......@@ -140,7 +140,7 @@ static unsigned long get_long(struct task_struct * tsk,
}
page = pte_page(*pgtable);
/* this is a hack for non-kernel-mapped video buffers and similar */
if (page >= high_memory)
if (MAP_NR(page) >= max_mapnr)
return 0;
page += addr & ~PAGE_MASK;
return *(unsigned long *) page;
......@@ -196,7 +196,7 @@ static void put_long(struct task_struct * tsk, struct vm_area_struct * vma, unsi
goto repeat;
}
/* this is a hack for non-kernel-mapped video buffers and similar */
if (page < high_memory) {
if (MAP_NR(page) < max_mapnr) {
*(unsigned long *) (page + (addr & ~PAGE_MASK)) = data;
flush_page_to_ram (page);
}
......@@ -380,24 +380,16 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
res = read_long(child, addr, &tmp);
if (res < 0)
return res;
res = verify_area(VERIFY_WRITE, (void *) data, sizeof(long));
if (!res)
put_user(tmp, (unsigned long *) data);
return res;
return put_user(tmp, (unsigned long *) data);
}
/* read the word at location addr in the USER area. */
case PTRACE_PEEKUSR: {
unsigned long tmp;
int res;
if ((addr & 3) || addr < 0 || addr >= sizeof(struct user))
return -EIO;
res = verify_area(VERIFY_WRITE, (void *) data,
sizeof(long));
if (res)
return res;
tmp = 0; /* Default return condition */
addr = addr >> 2; /* temporary hack. */
if (addr < 19) {
......@@ -409,8 +401,7 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
tmp = child->tss.fp[addr - 21];
else
return -EIO;
put_user(tmp,(unsigned long *) data);
return 0;
return put_user(tmp,(unsigned long *) data);
}
/* when I and D space are separate, this will have to be fixed. */
......
arch/m68k/kernel/signal.c
View file @ 832c29d4
......@@ -32,7 +32,7 @@
#include <linux/unistd.h>
#include <asm/setup.h>
#include <asm/segment.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
#include <asm/traps.h>
......@@ -45,7 +45,7 @@
asmlinkage int sys_waitpid(pid_t pid,unsigned long * stat_addr, int options);
asmlinkage int do_signal(unsigned long oldmask, struct pt_regs *regs);
static const int extra_sizes[16] = {
const int frame_extra_sizes[16] = {
0,
-1, /* sizeof(((struct frame *)0)->un.fmt1), */
sizeof(((struct frame *)0)->un.fmt2),
......@@ -86,7 +86,7 @@ static unsigned char fpu_version = 0; /* version number of fpu, set by setup_fra
asmlinkage int do_sigreturn(unsigned long __unused)
{
struct sigcontext_struct context;
struct sigcontext context;
struct pt_regs *regs;
struct switch_stack *sw;
int fsize = 0;
......@@ -103,10 +103,8 @@ asmlinkage int do_sigreturn(unsigned long __unused)
regs = (struct pt_regs *) (sw + 1);
/* get previous context (including pointer to possible extra junk) */
if (verify_area(VERIFY_READ, (void *)usp, sizeof(context)))
goto badframe;
memcpy_fromfs(&context,(void *)usp, sizeof(context));
if (copy_from_user(&context,(void *)usp, sizeof(context)))
goto badframe;
fp = usp + sizeof (context);
......@@ -163,7 +161,7 @@ asmlinkage int do_sigreturn(unsigned long __unused)
}
__asm__ volatile ("frestore %0" : : "m" (*context.sc_fpstate));
fsize = extra_sizes[regs->format];
fsize = frame_extra_sizes[regs->format];
if (fsize < 0) {
/*
* user process trying to return with weird frame format
......@@ -182,31 +180,37 @@ asmlinkage int do_sigreturn(unsigned long __unused)
*/
if (fsize) {
if (verify_area(VERIFY_READ, (void *)fp, fsize))
goto badframe;
#define frame_offset (sizeof(struct pt_regs)+sizeof(struct switch_stack))
__asm__ __volatile__
("movel %0,%/a0\n\t"
"subl %1,%/a0\n\t" /* make room on stack */
"movel %/a0,%/sp\n\t" /* set stack pointer */
(" movel %0,%/a0\n\t"
" subl %1,%/a0\n\t" /* make room on stack */
" movel %/a0,%/sp\n\t" /* set stack pointer */
/* move switch_stack and pt_regs */
"1: movel %0@+,%/a0@+\n\t"
" dbra %2,1b\n\t"
"lea %/sp@(%c3),%/a0\n\t" /* add offset of fmt stuff */
"lsrl #2,%1\n\t"
"subql #1,%1\n\t"
" lea %/sp@(%c3),%/a0\n\t" /* add offset of fmt */
" lsrl #2,%1\n\t"
" subql #1,%1\n\t"
"2: movesl %4@+,%2\n\t"
" movel %2,%/a0@+\n\t"
"3: movel %2,%/a0@+\n\t"
" dbra %1,2b\n\t"
"bral " SYMBOL_NAME_STR(ret_from_signal)
" bral " SYMBOL_NAME_STR(ret_from_signal) "\n"
"4:\n"
".section __ex_table,\"a\"\n"
" .align 4\n"
" .long 2b,4b\n"
" .long 3b,4b\n"
".text"
: /* no outputs, it doesn't ever return */
: "a" (sw), "d" (fsize), "d" (frame_offset/4-1),
"n" (frame_offset), "a" (fp)
: "a0");
#undef frame_offset
/*
* If we ever get here an exception occured while
* building the above stack-frame.
*/
goto badframe;
/* NOTREACHED */
}
return regs->d0;
......@@ -255,14 +259,14 @@ asmlinkage int do_sigreturn(unsigned long __unused)
* longwords for format "B".
*/
#define UFRAME_SIZE(fs) (sizeof(struct sigcontext_struct)/4 + 6 + fs/4)
#define UFRAME_SIZE(fs) (sizeof(struct sigcontext)/4 + 6 + fs/4)
static void setup_frame (struct sigaction * sa, struct pt_regs *regs,
int signr, unsigned long oldmask)
{
struct sigcontext_struct context;
struct sigcontext context;
unsigned long *frame, *tframe;
int fsize = extra_sizes[regs->format];
int fsize = frame_extra_sizes[regs->format];
if (fsize < 0) {
printk ("setup_frame: Unknown frame format %#x\n",
......@@ -277,10 +281,9 @@ static void setup_frame (struct sigaction * sa, struct pt_regs *regs,
}
frame -= UFRAME_SIZE(fsize);
if (verify_area(VERIFY_WRITE,frame,UFRAME_SIZE(fsize)*4))
do_exit(SIGSEGV);
if (fsize) {
memcpy_tofs (frame + UFRAME_SIZE(0), regs + 1, fsize);
if (copy_to_user (frame + UFRAME_SIZE(0), regs + 1, fsize))
do_exit(SIGSEGV);
regs->stkadj = fsize;
}
......@@ -326,7 +329,8 @@ static void setup_frame (struct sigaction * sa, struct pt_regs *regs,
"m" (*context.sc_fpcntl)
: "memory");
}
memcpy_tofs (tframe, &context, sizeof(context));
if (copy_to_user (tframe, &context, sizeof(context)))
do_exit(SIGSEGV);
/*
* no matter what frame format we were using before, we
......@@ -440,7 +444,7 @@ asmlinkage int do_signal(unsigned long oldmask, struct pt_regs *regs)
isn't restarted (only needed on the
68030). */
if (regs->format == 10 || regs->format == 11) {
regs->stkadj = extra_sizes[regs->format];
regs->stkadj = frame_extra_sizes[regs->format];
regs->format = 0;
}
continue;
......
arch/m68k/kernel/sys_m68k.c
View file @ 832c29d4
......@@ -14,11 +14,13 @@
#include <linux/shm.h>
#include <linux/stat.h>
#include <linux/mman.h>
#include <linux/file.h>
#include <asm/setup.h>
#include <asm/segment.h>
#include <asm/uaccess.h>
#include <asm/cachectl.h>
#include <asm/traps.h>
#include <asm/ipc.h>
/*
* sys_pipe() is the normal C calling standard for creating
......@@ -47,47 +49,50 @@ asmlinkage int sys_pipe(unsigned long * fildes)
* used a memory block for parameter passing..
*/
asmlinkage int old_mmap(unsigned long *buffer)
struct mmap_arg_struct {
unsigned long addr;
unsigned long len;
unsigned long prot;
unsigned long flags;
unsigned long fd;
unsigned long offset;
};
asmlinkage int old_mmap(struct mmap_arg_struct *arg)
{
int error;
unsigned long flags;
struct file * file = NULL;
struct mmap_arg_struct a;
error = verify_area(VERIFY_READ, buffer, 6*sizeof(long));
error = verify_area(VERIFY_READ, arg, sizeof(*arg));
if (error)
return error;
flags = get_user(buffer+3);
if (!(flags & MAP_ANONYMOUS)) {
unsigned long fd = get_user(buffer+4);
if (fd >= NR_OPEN || !(file = current->files->fd[fd]))
copy_from_user(&a, arg, sizeof(a));
if (!(a.flags & MAP_ANONYMOUS)) {
if (a.fd >= NR_OPEN || !(file = current->files->fd[a.fd]))
return -EBADF;
}
flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
return do_mmap(file, get_user(buffer), get_user(buffer+1),
get_user(buffer+2), flags, get_user(buffer+5));
a.flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
error = do_mmap(file, a.addr, a.len, a.prot, a.flags, a.offset);
return error;
}
extern asmlinkage int sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
asmlinkage int old_select(unsigned long *buffer)
{
int n;
fd_set *inp;
fd_set *outp;
fd_set *exp;
struct sel_arg_struct {
unsigned long n;
fd_set *inp, *outp, *exp;
struct timeval *tvp;
};
n = verify_area(VERIFY_READ, buffer, 5*sizeof(unsigned long));
if (n)
return n;
asmlinkage int old_select(struct sel_arg_struct *arg)
{
struct sel_arg_struct a;
n = get_user(buffer);
inp = (fd_set *) get_user(buffer+1);
outp = (fd_set *) get_user(buffer+2);
exp = (fd_set *) get_user(buffer+3);
tvp = (struct timeval *) get_user(buffer+4);
return sys_select(n, inp, outp, exp, tvp);
if (copy_from_user(&a, arg, sizeof(a)))
return -EFAULT;
return sys_select(a.n, a.inp, a.outp, a.exp, a.tvp);
}
/*
......@@ -115,7 +120,7 @@ asmlinkage int sys_ipc (uint call, int first, int second, int third, void *ptr,
return -EINVAL;
if ((err = verify_area (VERIFY_READ, ptr, sizeof(long))))
return err;
fourth.__pad = get_user((void **)ptr);
get_user(fourth.__pad, (void **)ptr);
return sys_semctl (first, second, third, fourth);
}
default:
......@@ -130,13 +135,10 @@ asmlinkage int sys_ipc (uint call, int first, int second, int third, void *ptr,
switch (version) {
case 0: {
struct ipc_kludge tmp;
int err;
if (!ptr)
return -EINVAL;
if ((err = verify_area (VERIFY_READ, ptr, sizeof(tmp))))
return err;
memcpy_fromfs (&tmp,(struct ipc_kludge *) ptr,
sizeof (tmp));
if (copy_from_user (&tmp, ptr, sizeof (tmp)))
return -EFAULT;
return sys_msgrcv (first, tmp.msgp, second, tmp.msgtyp, third);
}
case 1: default:
......
arch/m68k/kernel/time.c
View file @ 832c29d4
......@@ -15,7 +15,6 @@
#include <linux/mm.h>
#include <asm/machdep.h>
#include <asm/segment.h>
#include <asm/io.h>
#include <linux/timex.h>
......
arch/m68k/kernel/traps.c
View file @ 832c29d4
......@@ -30,7 +30,7 @@
#include <asm/setup.h>
#include <asm/system.h>
#include <asm/segment.h>
#include <asm/uaccess.h>
#include <asm/traps.h>
#include <asm/pgtable.h>
#include <asm/machdep.h>
......@@ -96,7 +96,6 @@ void trap_init (void)
vectors[VEC_FPNAN] = snan_vec;
vectors[VEC_FPOE] = operr_vec;
vectors[VEC_FPBRUC] = bsun_vec;
vectors[VEC_FPBRUC] = bsun_vec;
vectors[VEC_LINE11] = fline_vec;
vectors[VEC_FPUNSUP] = unsupp_vec;
}
......@@ -159,7 +158,11 @@ char *vec_names[] = {
"SYSCALL", "TRAP #1", "TRAP #2", "TRAP #3",
"TRAP #4", "TRAP #5", "TRAP #6", "TRAP #7",
"TRAP #8", "TRAP #9", "TRAP #10", "TRAP #11",
"TRAP #12", "TRAP #13", "TRAP #14", "TRAP #15"
"TRAP #12", "TRAP #13", "TRAP #14", "TRAP #15",
"FPCP BSUN", "FPCP INEXACT", "FPCP DIV BY 0", "FPCP UNDERFLOW",
"FPCP OPERAND ERROR", "FPCP OVERFLOW", "FPCP SNAN",
"FPCP UNSUPPORTED OPERATION",
"MMU CONFIGUATION ERROR"
};
char *space_names[] = {
......@@ -205,7 +208,7 @@ static inline void access_error060 (struct frame *fp)
#endif
if (fslw & MMU060_MA)
addr = PAGE_ALIGN(addr);
do_page_fault( (struct pt_regs *)fp, addr, errorcode );
do_page_fault(&fp->ptregs, addr, errorcode);
}
else {
printk( "68060 access error, fslw=%lx\n", fslw );
......@@ -263,20 +266,20 @@ static void do_040writeback (unsigned short ssw,
mmusr = probe040 (1, wbs & WBTM_040, wba);
errorcode = (mmusr & MMU_R_040) ? 3 : 2;
if (do_page_fault ((struct pt_regs *)fp, wba, errorcode))
if (do_page_fault (&fp->ptregs, wba, errorcode))
/* just return if we can't perform the writeback */
return;
set_fs (wbs & WBTM_040);
switch (wbs & WBSIZ_040) {
case BA_SIZE_BYTE:
put_fs_byte (wbd & 0xff, (char *)wba);
put_user (wbd & 0xff, (char *)wba);
break;
case BA_SIZE_WORD:
put_fs_word (wbd & 0xffff, (short *)wba);
put_user (wbd & 0xffff, (short *)wba);
break;
case BA_SIZE_LONG:
put_fs_long (wbd, (int *)wba);
put_user (wbd, (int *)wba);
break;
}
set_fs (fs);
......@@ -317,7 +320,7 @@ static inline void access_error040 (struct frame *fp)
*/
errorcode = ((mmusr & MMU_R_040) ? 1 : 0) |
((ssw & RW_040) ? 0 : 2);
do_page_fault ((struct pt_regs *)fp, addr, errorcode);
do_page_fault (&fp->ptregs, addr, errorcode);
} else {
printk ("68040 access error, ssw=%x\n", ssw);
trap_c (fp);
......@@ -394,8 +397,8 @@ static inline void bus_error030 (struct frame *fp)
}
printk ("BAD KERNEL BUSERR\n");
die_if_kernel("Oops",&fp->ptregs,0);
force_sig(SIGSEGV, current);
user_space_fault = 0;
force_sig(SIGKILL, current);
return;
}
} else {
/* user fault */
......@@ -442,9 +445,12 @@ static inline void bus_error030 (struct frame *fp)
if (!(ssw & RW) || ssw & RM)
errorcode |= 2;
if (mmusr & (MMU_I | MMU_WP))
do_page_fault ((struct pt_regs *)fp, addr, errorcode);
else if (mmusr & (MMU_B|MMU_L|MMU_S)) {
if (mmusr & (MMU_I | MMU_WP)) {
/* Don't try to do anything further if an exception was
handled. */
if (do_page_fault (&fp->ptregs, addr, errorcode) < 0)
return;
} else if (mmusr & (MMU_B|MMU_L|MMU_S)) {
printk ("invalid %s access at %#lx from pc %#lx\n",
!(ssw & RW) ? "write" : "read", addr,
fp->ptregs.pc);
......@@ -572,7 +578,7 @@ static inline void bus_error030 (struct frame *fp)
#endif
if (mmusr & MMU_I)
do_page_fault ((struct pt_regs *)fp, addr, 0);
do_page_fault (&fp->ptregs, addr, 0);
else if (mmusr & (MMU_B|MMU_L|MMU_S)) {
printk ("invalid insn access at %#lx from pc %#lx\n",
addr, fp->ptregs.pc);
......@@ -733,18 +739,18 @@ static void dump_stack(struct frame *fp)
stack = (unsigned long *)addr;
endstack = (unsigned long *)PAGE_ALIGN(addr);
printk("Stack from %08lx:\n ", (unsigned long)stack);
printk("Stack from %08lx:", (unsigned long)stack);
for (i = 0; i < kstack_depth_to_print; i++) {
if (stack + 1 > endstack)
break;
if (i && ((i % 8) == 0))
if (i % 8 == 0)
printk("\n ");
printk("%08lx ", *stack++);
printk(" %08lx", *stack++);
}
printk ("\nCall Trace: ");
printk ("\nCall Trace:");
stack = (unsigned long *) addr;
i = 1;
i = 0;
module_start = VMALLOC_START;
module_end = module_start + MODULE_RANGE;
while (stack + 1 <= endstack) {
......@@ -760,9 +766,9 @@ static void dump_stack(struct frame *fp)
if (((addr >= (unsigned long) &_start) &&
(addr <= (unsigned long) &_etext)) ||
((addr >= module_start) && (addr <= module_end))) {
if (i && ((i % 8) == 0))
if (i % 4 == 0)
printk("\n ");
printk("[<%08lx>] ", addr);
printk(" [<%08lx>]", addr);
i++;
}
}
......@@ -775,7 +781,7 @@ static void dump_stack(struct frame *fp)
void bad_super_trap (struct frame *fp)
{
console_verbose();
if ((fp->ptregs.vector) < 48*4)
if (fp->ptregs.vector < 4*sizeof(vec_names)/sizeof(vec_names[0]))
printk ("*** %s *** FORMAT=%X\n",
vec_names[(fp->ptregs.vector) >> 2],
fp->ptregs.format);
......
arch/m68k/lib/checksum.c
View file @ 832c29d4
......@@ -124,7 +124,7 @@ csum_partial (const unsigned char *buff, int len, unsigned int sum)
/*
* copy from fs while checksumming, otherwise like csum_partial
* copy from user space while checksumming, otherwise like csum_partial
*/
unsigned int
......@@ -138,7 +138,8 @@ csum_partial_copy_fromuser(const char *src, char *dst, int len, int sum)
"jgt 1f\n\t"
"addql #2,%1\n\t" /* len was == 2, treat only rest */
"jra 4f\n"
"1:\t"
"1:\n"
"10:\t"
"movesw %2@+,%4\n\t" /* add first word to sum */
"addw %4,%0\n\t"
"movew %4,%3@+\n\t"
......@@ -150,28 +151,36 @@ csum_partial_copy_fromuser(const char *src, char *dst, int len, int sum)
"lsrl #5,%1\n\t" /* len/32 */
"jeq 2f\n\t" /* not enough... */
"subql #1,%1\n"
"1:\t"
"1:\n"
"11:\t"
"movesl %2@+,%5\n\t"
"addxl %5,%0\n\t"
"movel %5,%3@+\n\t"
"12:\t"
"movesl %2@+,%5\n\t"
"addxl %5,%0\n\t"
"movel %5,%3@+\n\t"
"13:\t"
"movesl %2@+,%5\n\t"
"addxl %5,%0\n\t"
"movel %5,%3@+\n\t"
"14:\t"
"movesl %2@+,%5\n\t"
"addxl %5,%0\n\t"
"movel %5,%3@+\n\t"
"15:\t"
"movesl %2@+,%5\n\t"
"addxl %5,%0\n\t"
"movel %5,%3@+\n\t"
"16:\t"
"movesl %2@+,%5\n\t"
"addxl %5,%0\n\t"
"movel %5,%3@+\n\t"
"17:\t"
"movesl %2@+,%5\n\t"
"addxl %5,%0\n\t"
"movel %5,%3@+\n\t"
"18:\t"
"movesl %2@+,%5\n\t"
"addxl %5,%0\n\t"
"movel %5,%3@+\n\t"
......@@ -187,8 +196,9 @@ csum_partial_copy_fromuser(const char *src, char *dst, int len, int sum)
"jeq 4f\n\t"
"lsrw #2,%4\n\t"
"subqw #1,%4\n"
"3:\t"
"3:\n"
/* loop for rest longs */
"19:\t"
"movesl %2@+,%5\n\t"
"addxl %5,%0\n\t"
"movel %5,%3@+\n\t"
......@@ -202,12 +212,14 @@ csum_partial_copy_fromuser(const char *src, char *dst, int len, int sum)
"clrl %5\n\t" /* clear tmp2 for rest bytes */
"subqw #2,%1\n\t"
"jlt 5f\n\t"
"20:\t"
"movesw %2@+,%5\n\t" /* have rest >= 2: get word */
"movew %5,%3@+\n\t"
"swap %5\n\t" /* into bits 16..31 */
"tstw %1\n\t" /* another byte? */
"jeq 6f\n"
"5:\t"
"5:\n"
"21:\t"
"movesb %2@,%5\n\t" /* have odd rest: get byte */
"moveb %5,%3@+\n\t"
"lslw #8,%5\n\t" /* into bits 8..15; 16..31 untouched */
......@@ -215,7 +227,21 @@ csum_partial_copy_fromuser(const char *src, char *dst, int len, int sum)
"addl %5,%0\n\t" /* now add rest long to sum */
"clrl %5\n\t"
"addxl %5,%0\n" /* add X bit */
"7:\t"
"7:\n"
".section __ex_table,\"a\"\n"
".long 10b,7b\n"
".long 11b,7b\n"
".long 12b,7b\n"
".long 13b,7b\n"
".long 14b,7b\n"
".long 15b,7b\n"
".long 16b,7b\n"
".long 17b,7b\n"
".long 18b,7b\n"
".long 19b,7b\n"
".long 20b,7b\n"
".long 21b,7b\n"
".text"
: "=d" (sum), "=d" (len), "=a" (src), "=a" (dst),
"=&d" (tmp1), "=&d" (tmp2)
: "0" (sum), "1" (len), "2" (src), "3" (dst)
......@@ -223,7 +249,7 @@ csum_partial_copy_fromuser(const char *src, char *dst, int len, int sum)
return(sum);
}
/*
* copy from ds while checksumming, otherwise like csum_partial
* copy from kernel space while checksumming, otherwise like csum_partial
*/
unsigned int
......
arch/m68k/lib/semaphore.S
View file @ 832c29d4
......@@ -11,19 +11,24 @@
/*
* "down_failed" is called with the eventual return address
* in %a0, and the address of the semaphore in %a1. We need
* to increment the number of waiters on the semaphore,
* call "__down()", and then eventually return to try again.
* to call "__down()", and then re-try until we succeed..
*/
ENTRY(down_failed)
movel %a0,-(%sp)
movel %a1,-(%sp)
ENTRY(__down_failed)
moveml %a0/%d0/%d1,-(%sp)
1: movel %a1,-(%sp)
jbsr SYMBOL_NAME(__down)
movel (%sp)+,%a1
subql #1,(%a1)
jmi 1b
movel (%sp)+,%d0
movel (%sp)+,%d1
rts
ENTRY(up_wakeup)
movel %a0,-(%sp)
ENTRY(__up_wakeup)
moveml %a0/%d0/%d1,-(%sp)
movel %a1,-(%sp)
jbsr SYMBOL_NAME(__up)
movel (%sp)+,%a1
movel (%sp)+,%d0
movel (%sp)+,%d1
rts
arch/m68k/mm/Makefile
View file @ 832c29d4
......@@ -8,6 +8,6 @@
# Note 2! The CFLAGS definition is now in the main makefile...
O_TARGET := mm.o
O_OBJS := init.o fault.o memory.o
O_OBJS := init.o fault.o memory.o extable.o
include $(TOPDIR)/Rules.make
arch/m68k/mm/extable.c 0 → 100644
View file @ 832c29d4
/*
* linux/arch/m68k/mm/extable.c
*/
#include <linux/config.h>
#include <linux/module.h>
#include <asm/uaccess.h>
extern const struct exception_table_entry __start___ex_table[];
extern const struct exception_table_entry __stop___ex_table[];
static inline unsigned long
search_one_table(const struct exception_table_entry *first,
const struct exception_table_entry *last,
unsigned long value)
{
while (first <= last) {
const struct exception_table_entry *mid;
long diff;
mid = (last - first) / 2 + first;
diff = value - mid->insn;
if (diff >= 0 && diff <= 2)
return mid->fixup;
else if (diff > 0)
first = mid+1;
else
last = mid-1;
}
return 0;
}
unsigned long
search_exception_table(unsigned long addr)
{
unsigned long ret;
#ifdef CONFIG_MODULES
struct module *mp;
#endif
/* Search the kernel's table first. */
ret = search_one_table(__start___ex_table, __stop___ex_table-1, addr);
if (ret)
return ret;
#ifdef CONFIG_MODULES
for (mp = module_list; mp != NULL; mp = mp->next) {
if (mp->exceptinfo.start != NULL) {
ret = search_one_table(mp->exceptinfo.start,
mp->exceptinfo.stop-1, addr);
if (ret)
return ret;
}
}
#endif
return 0;
}
arch/m68k/mm/fault.c
View file @ 832c29d4
......@@ -9,10 +9,14 @@
#include <linux/kernel.h>
#include <linux/ptrace.h>
#include <asm/setup.h>
#include <asm/traps.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
extern void die_if_kernel(char *, struct pt_regs *, long);
extern const int frame_extra_sizes[]; /* in m68k/kernel/signal.c */
/*
* This routine handles page faults. It determines the problem, and
......@@ -28,14 +32,20 @@ extern void die_if_kernel(char *, struct pt_regs *, long);
asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,
unsigned long error_code)
{
struct vm_area_struct * vma;
void (*handler)(struct task_struct *,
struct vm_area_struct *,
unsigned long,
int);
struct task_struct *tsk = current;
struct mm_struct *mm = tsk->mm;
struct vm_area_struct * vma;
unsigned long fixup, fault_pc;
int write;
#ifdef DEBUG
printk ("regs->sr=%#x, regs->pc=%#lx, address=%#lx, %ld, %p\n",
regs->sr, regs->pc, address, error_code,
tsk->tss.pagedir_v);
tsk->mm->pgd);
#endif
down(&mm->mmap_sem);
......@@ -62,25 +72,24 @@ asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,
* we can handle it..
*/
good_area:
/*
* was it a write?
*/
if (error_code & 2) {
if (!(vma->vm_flags & VM_WRITE))
goto bad_area;
} else {
/* read with protection fault? */
if (error_code & 1)
goto bad_area;
if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
goto bad_area;
}
if (error_code & 1) {
do_wp_page(tsk, vma, address, error_code & 2);
up(&mm->mmap_sem);
return 0;
write = 0;
handler = do_no_page;
switch (error_code & 3) {
default: /* 3: write, present */
handler = do_wp_page;
/* fall through */
case 2: /* write, not present */
if (!(vma->vm_flags & VM_WRITE))
goto bad_area;
write++;
break;
case 1: /* read, present */
goto bad_area;
case 0: /* read, not present */
if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
goto bad_area;
}
do_no_page(tsk, vma, address, error_code & 2);
handler(tsk, vma, address, write);
up(&mm->mmap_sem);
/* There seems to be a missing invalidate somewhere in do_no_page.
......@@ -96,6 +105,26 @@ asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,
*/
bad_area:
up(&mm->mmap_sem);
/* Are we prepared to handle this fault? */
if (CPU_IS_060 && regs->format == 4)
fault_pc = ((struct frame *)regs)->un.fmt4.pc;
else
fault_pc = regs->pc;
if ((fixup = search_exception_table(fault_pc)) != 0) {
struct pt_regs *tregs;
printk("Exception at %lx (%lx)\n", fault_pc, fixup);
/* Create a new four word stack frame, discarding the old
one. */
regs->stkadj = frame_extra_sizes[regs->format];
tregs = (struct pt_regs *)((ulong)regs + regs->stkadj);
tregs->vector = regs->vector;
tregs->format = 0;
tregs->pc = fixup;
tregs->sr = regs->sr;
return -1;
}
if (user_mode(regs)) {
/* User memory access */
force_sig (SIGSEGV, tsk);
......@@ -116,4 +145,3 @@ asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,
return 1;
}
arch/m68k/mm/init.c
View file @ 832c29d4
......@@ -17,7 +17,7 @@
#endif
#include <asm/setup.h>
#include <asm/segment.h>
#include <asm/uaccess.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include <asm/system.h>
......@@ -66,7 +66,7 @@ void show_mem(void)
printk("\nMem-info:\n");
show_free_areas();
printk("Free swap: %6dkB\n",nr_swap_pages<<(PAGE_SHIFT-10));
i = high_memory >> PAGE_SHIFT;
i = max_mapnr;
while (i-- > 0) {
total++;
if (PageReserved(mem_map+i))
......@@ -89,12 +89,14 @@ void show_mem(void)
#endif
}
#ifndef mm_cachebits
/*
* Bits to add to page descriptors for "normal" caching mode.
* For 68020/030 this is 0.
* For 68040, this is _PAGE_CACHE040 (cachable, copyback)
*/
unsigned long mm_cachebits = 0;
#endif
pte_t *kernel_page_table (unsigned long *memavailp)
{
......@@ -216,7 +218,8 @@ static unsigned long map_chunk (unsigned long addr,
*/
for (i = 0; i < 64; i++) {
pte_val(ktablep[i]) = physaddr | _PAGE_PRESENT
| _PAGE_CACHE040 | _PAGE_GLOBAL040;
| _PAGE_CACHE040 | _PAGE_GLOBAL040
| _PAGE_ACCESSED;
physaddr += PAGE_SIZE;
}
ktablep += 64;
......@@ -227,7 +230,7 @@ static unsigned long map_chunk (unsigned long addr,
* 64 entry section of the page table.
*/
kpointerp[pindex++] = ktable | _PAGE_TABLE;
kpointerp[pindex++] = ktable | _PAGE_TABLE | _PAGE_ACCESSED;
} else {
/*
* 68030, use early termination page descriptors.
......@@ -247,16 +250,16 @@ static unsigned long map_chunk (unsigned long addr,
tbl = (unsigned long *)get_kpointer_table();
kpointerp[pindex++] = VTOP(tbl) | _PAGE_TABLE;
kpointerp[pindex++] = VTOP(tbl) | _PAGE_TABLE |_PAGE_ACCESSED;
for (i = 0; i < 64; i++, physaddr += PAGE_SIZE)
tbl[i] = physaddr | _PAGE_PRESENT;
tbl[i] = physaddr | _PAGE_PRESENT | _PAGE_ACCESSED;
/* unmap the zero page */
tbl[0] = 0;
} else {
/* not the first 256K */
kpointerp[pindex++] = physaddr | _PAGE_PRESENT;
kpointerp[pindex++] = physaddr | _PAGE_PRESENT | _PAGE_ACCESSED;
#ifdef DEBUG
printk ("%lx=%lx ", VTOP(&kpointerp[pindex-1]),
kpointerp[pindex-1]);
......@@ -302,7 +305,9 @@ unsigned long paging_init(unsigned long start_mem, unsigned long end_mem)
/* Fix the cache mode in the page descriptors for the 680[46]0. */
if (CPU_IS_040_OR_060) {
int i;
#ifndef mm_cachebits
mm_cachebits = _PAGE_CACHE040;
#endif
for (i = 0; i < 16; i++)
pgprot_val(protection_map[i]) |= _PAGE_CACHE040;
}
......@@ -358,18 +363,16 @@ unsigned long paging_init(unsigned long start_mem, unsigned long end_mem)
#endif
memset (swapper_pg_dir, 0, sizeof(pgd_t)*PTRS_PER_PGD);
task[0]->tss.pagedir_v = (unsigned long *)swapper_pg_dir;
task[0]->tss.pagedir_p = VTOP (swapper_pg_dir);
/* setup CPU root pointer for swapper task */
task[0]->tss.crp[0] = 0x80000000 | _PAGE_TABLE;
task[0]->tss.crp[1] = VTOP (swapper_pg_dir);
#ifdef DEBUG
printk ("task 0 pagedir at %p virt, %#lx phys\n",
task[0]->tss.pagedir_v, task[0]->tss.pagedir_p);
swapper_pg_dir, task[0]->tss.crp[1]);
#endif
/* setup CPU root pointer for swapper task */
task[0]->tss.crp[0] = 0x80000000 | _PAGE_SHORT;
task[0]->tss.crp[1] = task[0]->tss.pagedir_p;
if (CPU_IS_040_OR_060)
asm __volatile__ ("movel %0,%/d0\n\t"
".long 0x4e7b0806" /* movec d0,urp */
......@@ -406,10 +409,11 @@ void mem_init(unsigned long start_mem, unsigned long end_mem)
extern int _etext;
end_mem &= PAGE_MASK;
high_memory = end_mem;
high_memory = (void *) end_mem;
max_mapnr = MAP_NR(end_mem);
start_mem = PAGE_ALIGN(start_mem);
while (start_mem < high_memory) {
while (start_mem < end_mem) {
clear_bit(PG_reserved, &mem_map[MAP_NR(start_mem)].flags);
start_mem += PAGE_SIZE;
}
......@@ -444,9 +448,6 @@ void mem_init(unsigned long start_mem, unsigned long end_mem)
}
}
#endif
#ifdef DEBUG
printk ("task[0] root table is %p\n", task[0]->tss.pagedir_v);
#endif
for (tmp = 0 ; tmp < end_mem ; tmp += PAGE_SIZE) {
......@@ -466,10 +467,9 @@ void mem_init(unsigned long start_mem, unsigned long end_mem)
#endif
free_page(tmp);
}
tmp = nr_free_pages << PAGE_SHIFT;
printk("Memory: %luk/%luk available (%dk kernel code, %dk data)\n",
tmp >> 10,
high_memory >> 10,
(unsigned long) nr_free_pages << (PAGE_SHIFT-10),
max_mapnr << (PAGE_SHIFT-10),
codepages << (PAGE_SHIFT-10),
datapages << (PAGE_SHIFT-10));
}
......@@ -478,7 +478,7 @@ void si_meminfo(struct sysinfo *val)
{
unsigned long i;
i = high_memory >> PAGE_SHIFT;
i = max_mapnr;
val->totalram = 0;
val->sharedram = 0;
val->freeram = nr_free_pages << PAGE_SHIFT;
......
arch/m68k/tools/amiga/Makefile
View file @ 832c29d4
......@@ -9,14 +9,3 @@ All: dmesg
dmesg: dmesg.c
$(CC) $(CFLAGS) -o dmesg dmesg.c -noixemul
CC = m68k-cbm-amigados-gcc
CFLAGS = -Wall -O2
All: dmesg
dmesg: dmesg.c
$(CC) $(CFLAGS) -o dmesg dmesg.c -noixemul
drivers/block/ide-probe.c
View file @ 832c29d4
......@@ -75,7 +75,7 @@ static inline void do_identify (ide_drive_t *drive, byte cmd)
sti();
ide_fix_driveid(id);
#if defined (CONFIG_SCSI_EATA_DMA) || defined (CONFIG_SCSI_EATA_PIO)
#if defined (CONFIG_SCSI_EATA_DMA) || defined (CONFIG_SCSI_EATA_PIO) || defined (CONFIG_SCSI_EATA)
/*
* EATA SCSI controllers do a hardware ATA emulation:
* Ignore them if there is a driver for them available.
......
drivers/block/linear.c
View file @ 832c29d4
......@@ -20,9 +20,10 @@
#include <linux/module.h>
#include <linux/md.h>
#include <linux/linear.h>
#include <linux/malloc.h>
#include "linear.h"
#define MAJOR_NR MD_MAJOR
#define MD_DRIVER
#define MD_PERSONALITY
......
include/linux/linear.h → drivers/block/linear.h
View file @ 832c29d4
#ifndef _LINEAR_H
#define _LINEAR_H
struct linear_hash
{
struct real_dev *dev0, *dev1;
};
struct linear_data
{
struct linear_hash *hash_table; /* Dynamically allocated */
struct real_dev *smallest;
int nr_zones;
};
#endif
#ifndef _LINEAR_H
#define _LINEAR_H
......
drivers/char/Makefile
View file @ 832c29d4
......@@ -196,14 +196,6 @@ else
endif
endif
ifeq ($(CONFIG_BAYCOM),y)
L_OBJS += baycom.o
else
ifeq ($(CONFIG_BAYCOM),m)
M_OBJS += baycom.o
endif
endif
ifdef CONFIG_TGA_CONSOLE
L_OBJS += tga.o
else
......
drivers/net/tulip.c
View file @ 832c29d4
......@@ -1002,7 +1002,8 @@ tulip_rx(struct device *dev)
if (status & TRING_RxFIFO) lp->stats.rx_fifo_errors++;
} else {
/* Malloc up new buffer, compatible with net-2e. */
short pkt_len = lp->rx_ring[entry].status >> 16;
/* Omit the four octet CRC from the length. */
short pkt_len = (lp->rx_ring[entry].status >> 16) - 4;
struct sk_buff *skb;
skb = dev_alloc_skb(pkt_len + 2);
......
drivers/pci/pci.c
View file @ 832c29d4
......@@ -211,6 +211,8 @@ struct pci_dev_info dev_info[] = {
DEVICE( AVANCE, AVANCE_2302, "ALG-2302"),
DEVICE( S3, S3_ViRGE, "ViRGE"),
DEVICE( S3, S3_TRIO, "Trio32/Trio64"),
DEVICE( S3, S3_AURORA64VP, "Aurora64V+"),
DEVICE( S3, S3_TRIO64UVP, "Trio64UV+"),
DEVICE( S3, S3_ViRGE_VX, "ViRGE/VX"),
DEVICE( S3, S3_868, "Vision 868"),
DEVICE( S3, S3_928, "Vision 928-P"),
......
drivers/scsi/Config.in
View file @ 832c29d4
......@@ -29,7 +29,7 @@ dep_tristate 'BusLogic SCSI support' CONFIG_SCSI_BUSLOGIC $CONFIG_SCSI
dep_tristate 'DTC3180/3280 SCSI support' CONFIG_SCSI_DTC3280 $CONFIG_SCSI
dep_tristate 'EATA-DMA (DPT, NEC, AT&T, SNI, AST, Olivetti, Alphatronix) support' CONFIG_SCSI_EATA_DMA $CONFIG_SCSI
dep_tristate 'EATA-PIO (old DPT PM2001, PM2012A) support' CONFIG_SCSI_EATA_PIO $CONFIG_SCSI
dep_tristate 'EATA ISA/EISA (DPT PM2011/021/012/022/122/322) support' CONFIG_SCSI_EATA $CONFIG_SCSI
dep_tristate 'EATA ISA/EISA/PCI (DPT and generic EATA/DMA-compliant boards) support' CONFIG_SCSI_EATA $CONFIG_SCSI
dep_tristate 'Future Domain 16xx SCSI support' CONFIG_SCSI_FUTURE_DOMAIN $CONFIG_SCSI
dep_tristate 'Generic NCR5380/53c400 SCSI support' CONFIG_SCSI_GENERIC_NCR5380 $CONFIG_SCSI
if [ "$CONFIG_SCSI_GENERIC_NCR5380" != "n" ]; then
......
drivers/scsi/eata.c
View file @ 832c29d4
This diff is collapsed.
drivers/scsi/eata.h
View file @ 832c29d4
......@@ -11,7 +11,7 @@ int eata2x_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
int eata2x_abort(Scsi_Cmnd *);
int eata2x_reset(Scsi_Cmnd *, unsigned int);
#define EATA_VERSION "2.12.00"
#define EATA_VERSION "2.20.00"
#define EATA { \
......
drivers/scsi/g_NCR5380.c
View file @ 832c29d4
......@@ -386,14 +386,15 @@ static inline int NCR5380_pread (struct Scsi_Host *instance, unsigned char *dst,
blocks--;
}
if (blocks) {
#if (NDEBUG & NDEBUG_C400_PREAD)
printk("53C400r: EXTRA: Waiting for buffer\n");
printk("53C400r: EXTRA: Waiting for buffer\n");
#endif
while (NCR5380_read(C400_CONTROL_STATUS_REG) & CSR_HOST_BUF_NOT_RDY)
;
while (NCR5380_read(C400_CONTROL_STATUS_REG) & CSR_HOST_BUF_NOT_RDY)
;
#if (NDEBUG & NDEBUG_C400_PREAD)
printk("53C400r: Transferring EXTRA 128 bytes\n");
printk("53C400r: Transferring EXTRA 128 bytes\n");
#endif
#ifdef CONFIG_SCSI_G_NCR5380_PORT
for (i=0; i<128; i++)
......@@ -402,8 +403,13 @@ static inline int NCR5380_pread (struct Scsi_Host *instance, unsigned char *dst,
/* implies CONFIG_SCSI_G_NCR5380_MEM */
memmove(dst+start,NCR53C400_host_buffer+NCR5380_map_name,128);
#endif
start+=128;
blocks--;
start+=128;
blocks--;
}
#if (NDEBUG & NDEBUG_C400_PREAD)
else
printk("53C400r: No EXTRA required\n");
#endif
#if (NDEBUG & NDEBUG_C400_PREAD)
printk("53C400r: Final values: blocks=%d start=%d\n", blocks, start);
......
drivers/scsi/sr_ioctl.c
View file @ 832c29d4
......@@ -246,17 +246,22 @@ int sr_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void* arg)
case CDROMPLAYMSF:
{
struct cdrom_msf* msf = (struct cdrom_msf*)arg;
struct cdrom_msf msf;
if (copy_from_user(&msf, (void *) arg, sizeof(msf))) {
result = -EFAULT;
break;
}
sr_cmd[0] = SCMD_PLAYAUDIO_MSF;
sr_cmd[1] = scsi_CDs[target].device->lun << 5;
sr_cmd[2] = 0;
sr_cmd[3] = msf->cdmsf_min0;
sr_cmd[4] = msf->cdmsf_sec0;
sr_cmd[5] = msf->cdmsf_frame0;
sr_cmd[6] = msf->cdmsf_min1;
sr_cmd[7] = msf->cdmsf_sec1;
sr_cmd[8] = msf->cdmsf_frame1;
sr_cmd[3] = msf.cdmsf_min0;
sr_cmd[4] = msf.cdmsf_sec0;
sr_cmd[5] = msf.cdmsf_frame0;
sr_cmd[6] = msf.cdmsf_min1;
sr_cmd[7] = msf.cdmsf_sec1;
sr_cmd[8] = msf.cdmsf_frame1;
sr_cmd[9] = 0;
result = sr_do_ioctl(target, sr_cmd, NULL, 255);
......@@ -265,17 +270,22 @@ int sr_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void* arg)
case CDROMPLAYBLK:
{
struct cdrom_blk* blk = (struct cdrom_blk*)arg;
struct cdrom_blk blk;
if (copy_from_user(&blk, (void *) arg, sizeof(blk))) {
result = -EFAULT;
break;
}
sr_cmd[0] = SCMD_PLAYAUDIO10;
sr_cmd[1] = scsi_CDs[target].device->lun << 5;
sr_cmd[2] = blk->from >> 24;
sr_cmd[3] = blk->from >> 16;
sr_cmd[4] = blk->from >> 8;
sr_cmd[5] = blk->from;
sr_cmd[2] = blk.from >> 24;
sr_cmd[3] = blk.from >> 16;
sr_cmd[4] = blk.from >> 8;
sr_cmd[5] = blk.from;
sr_cmd[6] = 0;
sr_cmd[7] = blk->len >> 8;
sr_cmd[8] = blk->len;
sr_cmd[7] = blk.len >> 8;
sr_cmd[8] = blk.len;
sr_cmd[9] = 0;
result = sr_do_ioctl(target, sr_cmd, NULL, 255);
......@@ -284,17 +294,22 @@ int sr_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void* arg)
case CDROMPLAYTRKIND:
{
struct cdrom_ti* ti = (struct cdrom_ti*)arg;
struct cdrom_ti ti;
if (copy_from_user(&ti, (void *) arg, sizeof(ti))) {
result = -EFAULT;
break;
}
sr_cmd[0] = SCMD_PLAYAUDIO_TI;
sr_cmd[1] = scsi_CDs[target].device->lun << 5;
sr_cmd[2] = 0;
sr_cmd[3] = 0;
sr_cmd[4] = ti->cdti_trk0;
sr_cmd[5] = ti->cdti_ind0;
sr_cmd[4] = ti.cdti_trk0;
sr_cmd[5] = ti.cdti_ind0;
sr_cmd[6] = 0;
sr_cmd[7] = ti->cdti_trk1;
sr_cmd[8] = ti->cdti_ind1;
sr_cmd[7] = ti.cdti_trk1;
sr_cmd[8] = ti.cdti_ind1;
sr_cmd[9] = 0;
result = sr_do_ioctl(target, sr_cmd, NULL, 255);
......@@ -303,7 +318,7 @@ int sr_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void* arg)
case CDROMREADTOCHDR:
{
struct cdrom_tochdr* tochdr = (struct cdrom_tochdr*)arg;
struct cdrom_tochdr tochdr;
char * buffer;
sr_cmd[0] = SCMD_READ_TOC;
......@@ -319,23 +334,31 @@ int sr_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void* arg)
result = sr_do_ioctl(target, sr_cmd, buffer, 12);
tochdr->cdth_trk0 = buffer[2];
tochdr->cdth_trk1 = buffer[3];
tochdr.cdth_trk0 = buffer[2];
tochdr.cdth_trk1 = buffer[3];
scsi_free(buffer, 512);
if (copy_to_user ((void *) arg, &tochdr, sizeof (struct cdrom_tochdr)))
result = -EFAULT;
break;
}
case CDROMREADTOCENTRY:
{
struct cdrom_tocentry* tocentry = (struct cdrom_tocentry*)arg;
struct cdrom_tocentry tocentry;
unsigned char * buffer;
if (copy_from_user (&tocentry, (void *) arg, sizeof (struct cdrom_tocentry))) {
result = -EFAULT;
break;
}
sr_cmd[0] = SCMD_READ_TOC;
sr_cmd[1] = ((scsi_CDs[target].device->lun) << 5) |
(tocentry->cdte_format == CDROM_MSF ? 0x02 : 0);
(tocentry.cdte_format == CDROM_MSF ? 0x02 : 0);
sr_cmd[2] = sr_cmd[3] = sr_cmd[4] = sr_cmd[5] = 0;
sr_cmd[6] = tocentry->cdte_track;
sr_cmd[6] = tocentry.cdte_track;
sr_cmd[7] = 0; /* MSB of length (12) */
sr_cmd[8] = 12; /* LSB of length */
sr_cmd[9] = 0;
......@@ -345,18 +368,21 @@ int sr_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void* arg)
result = sr_do_ioctl (target, sr_cmd, buffer, 12);
tocentry->cdte_ctrl = buffer[5] & 0xf;
tocentry->cdte_adr = buffer[5] >> 4;
tocentry->cdte_datamode = (tocentry->cdte_ctrl & 0x04) ? 1 : 0;
if (tocentry->cdte_format == CDROM_MSF) {
tocentry->cdte_addr.msf.minute = buffer[9];
tocentry->cdte_addr.msf.second = buffer[10];
tocentry->cdte_addr.msf.frame = buffer[11];
tocentry.cdte_ctrl = buffer[5] & 0xf;
tocentry.cdte_adr = buffer[5] >> 4;
tocentry.cdte_datamode = (tocentry.cdte_ctrl & 0x04) ? 1 : 0;
if (tocentry.cdte_format == CDROM_MSF) {
tocentry.cdte_addr.msf.minute = buffer[9];
tocentry.cdte_addr.msf.second = buffer[10];
tocentry.cdte_addr.msf.frame = buffer[11];
} else
tocentry->cdte_addr.lba = (((((buffer[8] << 8) + buffer[9]) << 8)
tocentry.cdte_addr.lba = (((((buffer[8] << 8) + buffer[9]) << 8)
+ buffer[10]) << 8) + buffer[11];
scsi_free(buffer, 512);
if (copy_to_user ((void *) arg, &tocentry, sizeof (struct cdrom_tocentry)))
result = -EFAULT;
break;
}
......@@ -381,8 +407,13 @@ int sr_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void* arg)
case CDROMVOLCTRL:
{
char * buffer, * mask;
struct cdrom_volctrl* volctrl = (struct cdrom_volctrl*)arg;
struct cdrom_volctrl volctrl;
if (copy_from_user (&volctrl, (void *) arg, sizeof (struct cdrom_volctrl))) {
result = -EFAULT;
break;
}
/* First we get the current params so we can just twiddle the volume */
sr_cmd[0] = MODE_SENSE;
......@@ -425,10 +456,10 @@ int sr_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void* arg)
/* Now mask and substitute our own volume and reuse the rest */
buffer[0] = 0; /* Clear reserved field */
buffer[21] = volctrl->channel0 & mask[21];
buffer[23] = volctrl->channel1 & mask[23];
buffer[25] = volctrl->channel2 & mask[25];
buffer[27] = volctrl->channel3 & mask[27];
buffer[21] = volctrl.channel0 & mask[21];
buffer[23] = volctrl.channel1 & mask[23];
buffer[25] = volctrl.channel2 & mask[25];
buffer[27] = volctrl.channel3 & mask[27];
sr_cmd[0] = MODE_SELECT;
sr_cmd[1] = ((scsi_CDs[target].device -> lun) << 5) | 0x10; /* Params are SCSI-2 */
......@@ -445,7 +476,7 @@ int sr_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void* arg)
case CDROMVOLREAD:
{
char * buffer;
struct cdrom_volctrl* volctrl = (struct cdrom_volctrl*)arg;
struct cdrom_volctrl volctrl;
/* Get the current params */
......@@ -465,18 +496,21 @@ int sr_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void* arg)
break;
}
volctrl->channel0 = buffer[21];
volctrl->channel1 = buffer[23];
volctrl->channel2 = buffer[25];
volctrl->channel3 = buffer[27];
volctrl.channel0 = buffer[21];
volctrl.channel1 = buffer[23];
volctrl.channel2 = buffer[25];
volctrl.channel3 = buffer[27];
scsi_free(buffer, 512);
if (copy_to_user ((void *) arg, &volctrl, sizeof (struct cdrom_volctrl)))
result = -EFAULT;
break;
}
case CDROMSUBCHNL:
{
struct cdrom_subchnl* subchnl = (struct cdrom_subchnl*)arg;
struct cdrom_subchnl subchnl;
char * buffer;
sr_cmd[0] = SCMD_READ_SUBCHANNEL;
......@@ -494,20 +528,23 @@ int sr_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, void* arg)
result = sr_do_ioctl(target, sr_cmd, buffer, 16);
subchnl->cdsc_audiostatus = buffer[1];
subchnl->cdsc_format = CDROM_MSF;
subchnl->cdsc_ctrl = buffer[5] & 0xf;
subchnl->cdsc_trk = buffer[6];
subchnl->cdsc_ind = buffer[7];
subchnl.cdsc_audiostatus = buffer[1];
subchnl.cdsc_format = CDROM_MSF;
subchnl.cdsc_ctrl = buffer[5] & 0xf;
subchnl.cdsc_trk = buffer[6];
subchnl.cdsc_ind = buffer[7];
subchnl->cdsc_reladdr.msf.minute = buffer[13];
subchnl->cdsc_reladdr.msf.second = buffer[14];
subchnl->cdsc_reladdr.msf.frame = buffer[15];
subchnl->cdsc_absaddr.msf.minute = buffer[9];
subchnl->cdsc_absaddr.msf.second = buffer[10];
subchnl->cdsc_absaddr.msf.frame = buffer[11];
subchnl.cdsc_reladdr.msf.minute = buffer[13];
subchnl.cdsc_reladdr.msf.second = buffer[14];
subchnl.cdsc_reladdr.msf.frame = buffer[15];
subchnl.cdsc_absaddr.msf.minute = buffer[9];
subchnl.cdsc_absaddr.msf.second = buffer[10];
subchnl.cdsc_absaddr.msf.frame = buffer[11];
scsi_free(buffer, 512);
if (copy_to_user ((void *) arg, &subchnl, sizeof (struct cdrom_subchnl)))
result = -EFAULT;
break;
}
default:
......
drivers/scsi/u14-34f.c
View file @ 832c29d4
This diff is collapsed.
drivers/scsi/u14-34f.h
View file @ 832c29d4
......@@ -10,7 +10,7 @@ int u14_34f_abort(Scsi_Cmnd *);
int u14_34f_reset(Scsi_Cmnd *, unsigned int);
int u14_34f_biosparam(Disk *, kdev_t, int *);
#define U14_34F_VERSION "2.12.00"
#define U14_34F_VERSION "2.20.00"
#define ULTRASTOR_14_34F { \
NULL, /* Ptr for modules */ \
......
fs/binfmt_java.c
View file @ 832c29d4
......@@ -3,6 +3,9 @@
*
* Copyright (C) 1996 Brian A. Lantz
* derived from binfmt_script.c
*
* Simplified and modified to support binary java interpreters
* by Tom May <ftom@netcom.com>.
*/
#include <linux/module.h>
......@@ -13,35 +16,50 @@
#define _PATH_JAVA "/usr/bin/java"
#define _PATH_APPLET "/usr/bin/appletviewer"
#define _PATH_SH "/bin/bash"
/* These paths can be modified with sysctl(). */
char binfmt_java_interpreter[65] = _PATH_JAVA;
char binfmt_java_appletviewer[65] = _PATH_APPLET;
static int do_load_script(struct linux_binprm *bprm,struct pt_regs *regs)
static int do_load_java(struct linux_binprm *bprm,struct pt_regs *regs)
{
char *cp, *interp, *i_name;
char *i_name;
int len;
int retval;
unsigned char *ucp = (unsigned char *) bprm->buf;
if ((ucp[0] != 0xca) || (ucp[1] != 0xfe) || (ucp[2] != 0xba) || (ucp[3] != 0xbe))
return -ENOEXEC;
/*
* Fail if we're called recursively, e.g., the Java interpreter
* is a java binary.
*/
if (bprm->java)
return -ENOEXEC;
bprm->java = 1;
iput(bprm->inode);
bprm->dont_iput=1;
/*
* OK, we've set the interpreter name
* Splice in (1) the interpreter's name for argv[0] (_PATH_SH)
* (2) the name of the java wrapper for argv[1] (_PATH_JAVA)
* (3) filename of Java class (replace argv[0])
* without leading path or trailing '.class'
* Set args: [0] the name of the java interpreter
* [1] name of java class to execute, which is the
* filename without the path and without trailing
* ".class". Note that the interpreter will use
* its own way to found the class file (typically using
* environment variable CLASSPATH), and may in fact
* execute a different file from the one we want.
*
* This is done in reverse order, because of how the
* user environment and arguments are stored.
*/
remove_arg_zero(bprm);
if ((cp = strstr (bprm->filename, ".class")) != NULL)
*cp = 0;
len = strlen (bprm->filename);
if (len >= 6 && !strcmp (bprm->filename + len - 6, ".class"))
bprm->filename[len - 6] = 0;
if ((i_name = strrchr (bprm->filename, '/')) != NULL)
i_name++;
else
......@@ -49,27 +67,17 @@ static int do_load_script(struct linux_binprm *bprm,struct pt_regs *regs)
bprm->p = copy_strings(1, &i_name, bprm->page, bprm->p, 2);
bprm->argc++;
strcpy (bprm->buf, binfmt_java_interpreter);
cp = bprm->buf;
bprm->p = copy_strings(1, &cp, bprm->page, bprm->p, 2);
bprm->argc++;
strcpy (bprm->buf, _PATH_SH);
interp = bprm->buf;
if ((i_name = strrchr (bprm->buf, '/')) != NULL)
i_name++;
else
i_name = bprm->buf;
i_name = binfmt_java_interpreter;
bprm->p = copy_strings(1, &i_name, bprm->page, bprm->p, 2);
bprm->argc++;
if (!bprm->p)
return -E2BIG;
/*
* OK, now restart the process with the interpreter's inode.
* Note that we use open_namei() as the name is now in kernel
* space, and we don't need to copy it.
*/
retval = open_namei(interp, 0, 0, &bprm->inode, NULL);
bprm->filename = binfmt_java_interpreter;
retval = open_namei(binfmt_java_interpreter, 0, 0, &bprm->inode, NULL);
if (retval)
return retval;
bprm->dont_iput=0;
......@@ -82,7 +90,7 @@ static int do_load_script(struct linux_binprm *bprm,struct pt_regs *regs)
static int do_load_applet(struct linux_binprm *bprm,struct pt_regs *regs)
{
char *cp, *interp, *i_name;
char *i_name;
int retval;
if (strncmp (bprm->buf, "<!--applet", 10))
return -ENOEXEC;
......@@ -91,10 +99,8 @@ static int do_load_applet(struct linux_binprm *bprm,struct pt_regs *regs)
bprm->dont_iput=1;
/*
* OK, we've set the interpreter name
* Splice in (1) the interpreter's name for argv[0] (_PATH_SH)
* (2) the name of the appletviewer wrapper for argv[1] (_PATH_APPLET)
* (3) filename of html file (replace argv[0])
* Set args: [0] the name of the appletviewer
* [1] filename of html file
*
* This is done in reverse order, because of how the
* user environment and arguments are stored.
......@@ -104,27 +110,17 @@ static int do_load_applet(struct linux_binprm *bprm,struct pt_regs *regs)
bprm->p = copy_strings(1, &i_name, bprm->page, bprm->p, 2);
bprm->argc++;
strcpy (bprm->buf, binfmt_java_appletviewer);
cp = bprm->buf;
bprm->p = copy_strings(1, &cp, bprm->page, bprm->p, 2);
bprm->argc++;
strcpy (bprm->buf, _PATH_SH);
interp = bprm->buf;
if ((i_name = strrchr (bprm->buf, '/')) != NULL)
i_name++;
else
i_name = bprm->buf;
i_name = binfmt_java_appletviewer;
bprm->p = copy_strings(1, &i_name, bprm->page, bprm->p, 2);
bprm->argc++;
if (!bprm->p)
return -E2BIG;
/*
* OK, now restart the process with the interpreter's inode.
* Note that we use open_namei() as the name is now in kernel
* space, and we don't need to copy it.
*/
retval = open_namei(interp, 0, 0, &bprm->inode, NULL);
bprm->filename = binfmt_java_appletviewer;
retval = open_namei(binfmt_java_appletviewer, 0, 0, &bprm->inode, NULL);
if (retval)
return retval;
bprm->dont_iput=0;
......@@ -135,20 +131,20 @@ static int do_load_applet(struct linux_binprm *bprm,struct pt_regs *regs)
return search_binary_handler(bprm,regs);
}
static int load_script(struct linux_binprm *bprm,struct pt_regs *regs)
static int load_java(struct linux_binprm *bprm,struct pt_regs *regs)
{
int retval;
MOD_INC_USE_COUNT;
retval = do_load_script(bprm,regs);
retval = do_load_java(bprm,regs);
MOD_DEC_USE_COUNT;
return retval;
}
struct linux_binfmt java_format = {
static struct linux_binfmt java_format = {
#ifndef MODULE
NULL, 0, load_script, NULL, NULL
NULL, 0, load_java, NULL, NULL
#else
NULL, &mod_use_count_, load_script, NULL, NULL
NULL, &mod_use_count_, load_java, NULL, NULL
#endif
};
......@@ -161,7 +157,7 @@ static int load_applet(struct linux_binprm *bprm,struct pt_regs *regs)
return retval;
}
struct linux_binfmt applet_format = {
static struct linux_binfmt applet_format = {
#ifndef MODULE
NULL, 0, load_applet, NULL, NULL
#else
......@@ -170,7 +166,6 @@ struct linux_binfmt applet_format = {
};
int init_java_binfmt(void) {
printk(KERN_INFO "JAVA Binary support v1.01 for Linux 1.3.98 (C)1996 Brian A. Lantz\n");
register_binfmt(&java_format);
return register_binfmt(&applet_format);
}
......@@ -182,7 +177,6 @@ int init_module(void)
}
void cleanup_module( void) {
printk(KERN_INFO "Removing JAVA Binary support...\n");
unregister_binfmt(&java_format);
unregister_binfmt(&applet_format);
}
......
fs/binfmt_script.c
View file @ 832c29d4
......@@ -13,7 +13,8 @@
static int do_load_script(struct linux_binprm *bprm,struct pt_regs *regs)
{
char *cp, *interp, *i_name, *i_arg;
char *cp, *i_name, *i_arg;
char interp[128];
int retval;
if ((bprm->buf[0] != '#') || (bprm->buf[1] != '!') || (bprm->sh_bang))
return -ENOEXEC;
......@@ -38,9 +39,10 @@ static int do_load_script(struct linux_binprm *bprm,struct pt_regs *regs)
break;
}
for (cp = bprm->buf+2; (*cp == ' ') || (*cp == '\t'); cp++);
if (!cp || *cp == '\0')
if (cp == '\0')
return -ENOEXEC; /* No interpreter name found */
interp = i_name = cp;
strcpy (interp, cp);
i_name = cp;
i_arg = 0;
for ( ; *cp && (*cp != ' ') && (*cp != '\t'); cp++) {
if (*cp == '/')
......@@ -73,9 +75,8 @@ static int do_load_script(struct linux_binprm *bprm,struct pt_regs *regs)
return -E2BIG;
/*
* OK, now restart the process with the interpreter's inode.
* Note that we use open_namei() as the name is now in kernel
* space, and we don't need to copy it.
*/
bprm->filename = interp;
retval = open_namei(interp, 0, 0, &bprm->inode, NULL);
if (retval)
return retval;
......
fs/exec.c
View file @ 832c29d4
......@@ -629,6 +629,7 @@ int do_execve(char * filename, char ** argv, char ** envp, struct pt_regs * regs
return retval;
bprm.filename = filename;
bprm.sh_bang = 0;
bprm.java = 0;
bprm.loader = 0;
bprm.exec = 0;
bprm.dont_iput = 0;
......
fs/nfs/nfsroot.c
View file @ 832c29d4
......@@ -1560,7 +1560,7 @@ static int *root_nfs_call(int *end)
*/
static int *root_nfs_header(int proc, int program, int version)
{
int groups[] = { 0, NOGROUP };
gid_t groups[] = { 0 };
if (rpc_packet == NULL) {
if (!(rpc_packet = kmalloc(nfs_data.wsize + 1024, GFP_NFS))) {
......@@ -1568,7 +1568,7 @@ static int *root_nfs_header(int proc, int program, int version)
return NULL;
}
}
return rpc_header(rpc_packet, proc, program, version, 0, 0, groups);
return rpc_header(rpc_packet, proc, program, version, 0, 0, 1, groups);
}
......
fs/nfs/proc.c
View file @ 832c29d4
......@@ -904,10 +904,10 @@ int nfs_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle,
*/
int *rpc_header(int *p, int procedure, int program, int version,
int uid, int gid, int *groups)
int uid, int gid,
int ngroup, gid_t *groups)
{
int *p1, *p2;
int i;
int *p1;
static int xid = 0;
unsigned char *sys = (unsigned char *) system_utsname.nodename;
......@@ -927,10 +927,14 @@ int *rpc_header(int *p, int procedure, int program, int version,
p = xdr_encode_string(p, (char *) sys);
*p++ = htonl(uid);
*p++ = htonl(gid);
p2 = p++;
for (i = 0; i < 16 && i < NGROUPS && groups[i] != NOGROUP; i++)
*p++ = htonl(groups[i]);
*p2 = htonl(i);
if (ngroup > 16)
ngroup = 16;
*p++ = htonl(ngroup);
while (ngroup) {
*p++ = htonl(*groups);
groups++;
ngroup--;
}
*p1 = htonl((p - (p1 + 1)) << 2);
*p++ = htonl(RPC_AUTH_NULL);
*p++ = htonl(0);
......@@ -942,7 +946,7 @@ static int *nfs_rpc_header(int *p, int procedure, int ruid)
{
return rpc_header(p, procedure, NFS_PROGRAM, NFS_VERSION,
(ruid ? current->uid : current->fsuid),
current->egid, current->groups);
current->egid, current->ngroups, current->groups);
}
......
include/asm-i386/uaccess.h
View file @ 832c29d4
......@@ -408,7 +408,7 @@ clear_user(void *to, unsigned long n)
" .align 4\n" \
" .long 0b,3b\n" \
".text" \
: "=r"(res), "=r"(count) \
: "=d"(res), "=c"(count) \
: "i"(-EFAULT), "0"(count), "1"(count), "S"(src), "D"(dst) \
: "si", "di", "ax", "memory")
......
include/asm-m68k/atari_SLM.h 0 → 100644
View file @ 832c29d4
#ifndef _ATARI_SLM_H
#define _ATARI_SLM_H
/* Atari SLM laser printer specific ioctls */
#define SLMIOGSTAT 0xa100
#define SLMIOGPSIZE 0xa101
#define SLMIOGMFEED 0xa102
#define SLMIORESET 0xa140
#define SLMIOSPSIZE 0xa181
#define SLMIOSMFEED 0xa182
/* Status returning structure (SLMIOGSTAT) */
struct SLM_status {
int stat; /* numeric status code */
char str[40]; /* status string */
};
/* Paper size structure (SLMIO[GS]PSIZE) */
struct SLM_paper_size {
int width;
int height;
};
#endif /* _ATARI_SLM_H */
include/asm-m68k/byteorder.h
View file @ 832c29d4
......@@ -9,6 +9,38 @@
#define __BIG_ENDIAN_BITFIELD
#endif
#ifdef __KERNEL__
#include <linux/config.h>
#include <asm/types.h>
/*
* In-kernel byte order macros to handle stuff like
* byte-order-dependent filesystems etc.
*/
#define le16_to_cpu(__val) __swab16(__val)
#define le32_to_cpu(__val) __swab32(__val)
#define cpu_to_le32(__val) __swab32(__val)
#define cpu_to_le16(__val) __swab16(__val)
extern __inline__ __u16 __swab16 (__u16 val)
{
return (val << 8) | (val >> 8);
}
extern __inline__ __u32 __swab32 (__u32 val)
{
__asm__ ("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val));
return val;
}
#define cpu_to_be32(x) (x)
#define be32_to_cpu(x) (x)
#define cpu_to_be16(x) (x)
#define be16_to_cpu(x) (x)
#endif
#undef ntohl
#undef ntohs
#undef htonl
......@@ -37,6 +69,11 @@ __ntohs(unsigned short int x)
#define __htonl(x) __ntohl(x)
#define __htons(x) __ntohs(x)
#define __constant_htonl(x) (x)
#define __constant_htons(x) (x)
#define __constant_ntohl(x) (x)
#define __constant_ntohs(x) (x)
#ifdef __OPTIMIZE__
#define ntohl(x) __ntohl(x)
#define ntohs(x) __ntohs(x)
......
include/asm-m68k/elf.h
View file @ 832c29d4
......@@ -6,10 +6,11 @@
*/
#include <asm/ptrace.h>
#include <asm/user.h>
typedef unsigned long elf_greg_t;
#define ELF_NGREG 20 /* d1-d7/a0-a6/d0/usp/orig_d0/sr/pc/fmtvec */
#define ELF_NGREG (sizeof(struct user_regs_struct) / sizeof(elf_greg_t))
typedef elf_greg_t elf_gregset_t[ELF_NGREG];
typedef struct user_m68kfp_struct elf_fpregset_t;
......@@ -45,9 +46,10 @@ typedef struct user_m68kfp_struct elf_fpregset_t;
pr_reg[8] = regs->a1; \
pr_reg[14] = regs->d0; \
pr_reg[15] = rdusp(); \
pr_reg[16] = 0; /* orig_d0 */ \
pr_reg[16] = regs->orig_d0; \
pr_reg[17] = regs->sr; \
pr_reg[18] = regs->pc; \
pr_reg[19] = (regs->format << 12) | regs->vector; \
{ \
struct switch_stack *sw = ((struct switch_stack *)regs) - 1; \
pr_reg[5] = sw->d6; \
......
include/asm-m68k/io.h
View file @ 832c29d4
#ifndef _M68K_IO_H
#define _M68K_IO_H
static inline unsigned char get_user_byte_io(const char * addr)
{
register unsigned char _v;
#ifdef __KERNEL__
__asm__ __volatile__ ("moveb %1,%0":"=dm" (_v):"m" (*addr));
return _v;
}
#define inb_p(addr) get_user_byte_io((char *)(addr))
#define inb(addr) get_user_byte_io((char *)(addr))
/*
* readX/writeX() are used to access memory mapped devices. On some
* architectures the memory mapped IO stuff needs to be accessed
* differently. On the m68k architecture, we just read/write the
* memory location directly.
*/
#define readb(addr) (*(volatile unsigned char *) (addr))
#define readw(addr) (*(volatile unsigned short *) (addr))
#define readl(addr) (*(volatile unsigned int *) (addr))
static inline void put_user_byte_io(char val,char *addr)
{
__asm__ __volatile__ ("moveb %0,%1"
: /* no outputs */
:"idm" (val),"m" (*addr)
: "memory");
}
#define outb_p(x,addr) put_user_byte_io((x),(char *)(addr))
#define outb(x,addr) put_user_byte_io((x),(char *)(addr))
#define writeb(b,addr) ((*(volatile unsigned char *) (addr)) = (b))
#define writew(b,addr) ((*(volatile unsigned short *) (addr)) = (b))
#define writel(b,addr) ((*(volatile unsigned int *) (addr)) = (b))
#define memset_io(a,b,c) memset((void *)(a),(b),(c))
#define memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c))
#define memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c))
#define inb_p(addr) readb(addr)
#define inb(addr) readb(addr)
#define outb(x,addr) ((void) writeb(x,addr))
#define outb_p(x,addr) outb(x,addr)
/*
* Change virtual addresses to physical addresses and vv.
* These are trivial on the 1:1 Linux/i386 mapping (but if we ever
* make the kernel segment mapped at 0, we need to do translation
* on the i386 as well)
*/
extern unsigned long mm_vtop(unsigned long addr);
extern unsigned long mm_ptov(unsigned long addr);
extern unsigned long mm_vtop(unsigned long addr) __attribute__ ((const));
extern unsigned long mm_ptov(unsigned long addr) __attribute__ ((const));
extern inline unsigned long virt_to_phys(volatile void * address)
{
return (unsigned long) mm_vtop((unsigned long)address);
return mm_vtop((unsigned long)address);
}
extern inline void * phys_to_virt(unsigned long address)
......@@ -41,10 +44,11 @@ extern inline void * phys_to_virt(unsigned long address)
}
/*
* IO bus memory addresses are also 1:1 with the physical address
* IO bus memory addresses are 1:1 with the physical address
*/
#define virt_to_bus virt_to_phys
#define bus_to_virt phys_to_virt
#endif /* __KERNEL__ */
#endif /* _M68K_IO_H */
include/asm-m68k/ipc.h 0 → 100644
View file @ 832c29d4
#ifndef __m68k_IPC_H__
#define __m68k_IPC_H__
/*
* These are used to wrap system calls on m68k.
*
* See arch/m68k/kernel/sys_m68k.c for ugly details..
*/
struct ipc_kludge {
struct msgbuf *msgp;
long msgtyp;
};
#define SEMOP 1
#define SEMGET 2
#define SEMCTL 3
#define MSGSND 11
#define MSGRCV 12
#define MSGGET 13
#define MSGCTL 14
#define SHMAT 21
#define SHMDT 22
#define SHMGET 23
#define SHMCTL 24
#define IPCCALL(version,op) ((version)<<16 | (op))
#endif
include/asm-m68k/mman.h
View file @ 832c29d4
......@@ -16,6 +16,7 @@
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */
#define MAP_EXECUTABLE 0x1000 /* mark it as an executable */
#define MAP_LOCKED 0x2000 /* pages are locked */
#define MAP_NORESERVE 0x4000 /* don't check for reservations */
#define MS_ASYNC 1 /* sync memory asynchronously */
#define MS_INVALIDATE 2 /* invalidate the caches */
......
include/asm-m68k/page.h
View file @ 832c29d4
......@@ -10,6 +10,9 @@
#define STRICT_MM_TYPECHECKS
#define clear_page(page) memset((void *)(page), 0, PAGE_SIZE)
#define copy_page(to,from) memcpy((void *)(to), (void *)(from), PAGE_SIZE)
#ifdef STRICT_MM_TYPECHECKS
/*
* These are used to make use of C type-checking..
......@@ -50,18 +53,14 @@ typedef unsigned long pgprot_t;
#endif
/* This is the cache mode to be used for pages containing page descriptors for
* processors >= '040. It is in pte_mknocache(), and the variable is defined
* and initialized in head.S */
extern int m68k_pgtable_cachemode;
/* to align the pointer to the (next) page boundary */
#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
/* This handles the memory map.. */
#define PAGE_OFFSET 0
#define MAP_NR(addr) (((unsigned long)(addr)) >> PAGE_SHIFT)
#define MAP_PAGE_RESERVED (1<<15)
#define __pa(x) ((unsigned long)(x)-PAGE_OFFSET)
#define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
#define MAP_NR(addr) (__pa(addr) >> PAGE_SHIFT)
#endif /* __KERNEL__ */
......
include/asm-m68k/pgtable.h
View file @ 832c29d4
......@@ -116,7 +116,7 @@ typedef pte_table pte_tablepage[PTE_TABLES_PER_PAGE];
* area for the same reason. ;)
*/
#define VMALLOC_OFFSET (8*1024*1024)
#define VMALLOC_START ((high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
#define VMALLOC_START (((unsigned long) high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
#define VMALLOC_VMADDR(x) ((unsigned long)(x))
#endif /* __ASSEMBLY__ */
......@@ -147,7 +147,18 @@ typedef pte_table pte_tablepage[PTE_TABLES_PER_PAGE];
#ifndef __ASSEMBLY__
/* This is the cache mode to be used for pages containing page descriptors for
* processors >= '040. It is in pte_mknocache(), and the variable is defined
* and initialized in head.S */
extern int m68k_pgtable_cachemode;
#if defined(CONFIG_M68040_OR_M68060_ONLY)
#define mm_cachebits _PAGE_CACHE040
#elif defined(CONFIG_M68020_OR_M68030_ONLY)
#define mm_cachebits 0
#else
extern unsigned long mm_cachebits;
#endif
#define PAGE_NONE __pgprot(_PAGE_PRESENT | _PAGE_RONLY | _PAGE_ACCESSED | mm_cachebits)
#define PAGE_SHARED __pgprot(_PAGE_PRESENT | _PAGE_ACCESSED | mm_cachebits)
......@@ -215,8 +226,6 @@ extern pte_t * __bad_pagetable(void);
#define PAGE_PTR(address) \
((unsigned long)(address)>>(PAGE_SHIFT-SIZEOF_PTR_LOG2)&PTR_MASK&~PAGE_MASK)
extern unsigned long high_memory;
/* For virtual address to physical address conversion */
extern unsigned long mm_vtop(unsigned long addr) __attribute__ ((const));
extern unsigned long mm_ptov(unsigned long addr) __attribute__ ((const));
......@@ -227,8 +236,10 @@ extern unsigned long mm_ptov(unsigned long addr) __attribute__ ((const));
* Conversion functions: convert a page and protection to a page entry,
* and a page entry and page directory to the page they refer to.
*/
extern inline pte_t mk_pte(unsigned long page, pgprot_t pgprot)
{ pte_t pte; pte_val(pte) = VTOP(page) | pgprot_val(pgprot); return pte; }
#define mk_pte(page, pgprot) \
({ pte_t __pte; pte_val(__pte) = VTOP(page) + pgprot_val(pgprot); __pte; })
#define mk_pte_phys(physpage, pgprot) \
({ pte_t __pte; pte_val(__pte) = VTOP(physpage) + pgprot_val(pgprot); __pte; })
extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
{ pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot); return pte; }
......@@ -239,7 +250,7 @@ extern inline void pmd_set(pmd_t * pmdp, pte_t * ptep)
ptep = (pte_t *) VTOP(ptep);
for (i = 0; i < 16; i++, ptep += PTRS_PER_PTE/16)
pmdp->pmd[i] = _PAGE_TABLE | (unsigned long)ptep;
pmdp->pmd[i] = _PAGE_TABLE | _PAGE_ACCESSED | (unsigned long)ptep;
}
/* early termination version of the above */
......@@ -249,11 +260,11 @@ extern inline void pmd_set_et(pmd_t * pmdp, pte_t * ptep)
ptep = (pte_t *) VTOP(ptep);
for (i = 0; i < 16; i++, ptep += PTRS_PER_PTE/16)
pmdp->pmd[i] = _PAGE_PRESENT | (unsigned long)ptep;
pmdp->pmd[i] = _PAGE_PRESENT | _PAGE_ACCESSED | (unsigned long)ptep;
}
extern inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
{ pgd_val(*pgdp) = _PAGE_TABLE | VTOP(pmdp); }
{ pgd_val(*pgdp) = _PAGE_TABLE | _PAGE_ACCESSED | VTOP(pmdp); }
extern inline unsigned long pte_page(pte_t pte)
{ return PTOV(pte_val(pte) & PAGE_MASK); }
......@@ -271,7 +282,7 @@ extern inline void pte_clear(pte_t *ptep) { pte_val(*ptep) = 0; }
extern inline int pmd_none2(pmd_t *pmd) { return !pmd_val(*pmd); }
#define pmd_none(pmd) pmd_none2(&(pmd))
extern inline int pmd_bad2(pmd_t *pmd) { return (pmd_val(*pmd) & _DESCTYPE_MASK) != _PAGE_TABLE || pmd_page(*pmd) > high_memory; }
extern inline int pmd_bad2(pmd_t *pmd) { return (pmd_val(*pmd) & _DESCTYPE_MASK) != _PAGE_TABLE; }
#define pmd_bad(pmd) pmd_bad2(&(pmd))
extern inline int pmd_present2(pmd_t *pmd) { return pmd_val(*pmd) & _PAGE_TABLE; }
#define pmd_present(pmd) pmd_present2(&(pmd))
......@@ -284,7 +295,7 @@ extern inline void pmd_clear(pmd_t * pmdp)
}
extern inline int pgd_none(pgd_t pgd) { return !pgd_val(pgd); }
extern inline int pgd_bad(pgd_t pgd) { return (pgd_val(pgd) & _DESCTYPE_MASK) != _PAGE_TABLE || pgd_page(pgd) > high_memory; }
extern inline int pgd_bad(pgd_t pgd) { return (pgd_val(pgd) & _DESCTYPE_MASK) != _PAGE_TABLE; }
extern inline int pgd_present(pgd_t pgd) { return pgd_val(pgd) & _PAGE_TABLE; }
extern inline void pgd_clear(pgd_t * pgdp) { pgd_val(*pgdp) = 0; }
......@@ -319,10 +330,8 @@ extern inline pte_t pte_mkcache(pte_t pte) { pte_val(pte) = (pte_val(pte) & _CAC
/* to set the page-dir */
extern inline void SET_PAGE_DIR(struct task_struct * tsk, pgd_t * pgdir)
{
tsk->tss.pagedir_v = (unsigned long *)pgdir;
tsk->tss.pagedir_p = VTOP(pgdir);
tsk->tss.crp[0] = 0x80000000 | _PAGE_SHORT;
tsk->tss.crp[1] = tsk->tss.pagedir_p;
tsk->tss.crp[0] = 0x80000000 | _PAGE_TABLE;
tsk->tss.crp[1] = VTOP(pgdir);
if (tsk == current) {
if (CPU_IS_040_OR_060)
__asm__ __volatile__ ("movel %0@,%/d0\n\t"
......@@ -425,9 +434,10 @@ extern inline pte_t * pte_alloc(pmd_t * pmd, unsigned long address)
{
address = (address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1);
if (pmd_none(*pmd)) {
pte_t * page = (pte_t *)get_free_page(GFP_KERNEL);
pte_t * page = (pte_t *)__get_free_page(GFP_KERNEL);
if (pmd_none(*pmd)) {
if (page) {
memset((void *) page, 0, PAGE_SIZE);
nocache_page((unsigned long)page);
pmd_set(pmd,page);
return page + address;
......
include/asm-m68k/posix_types.h
View file @ 832c29d4
......@@ -13,6 +13,7 @@ typedef unsigned short __kernel_mode_t;
typedef unsigned short __kernel_nlink_t;
typedef long __kernel_off_t;
typedef int __kernel_pid_t;
typedef unsigned short __kernel_ipc_pid_t;
typedef unsigned short __kernel_uid_t;
typedef unsigned short __kernel_gid_t;
typedef unsigned int __kernel_size_t;
......
include/asm-m68k/processor.h
View file @ 832c29d4
......@@ -18,17 +18,9 @@
/*
* Bus types
*/
#define EISA_bus__is_a_macro 1
#define EISA_bus 0
#define MCA_bus__is_a_macro 1
#define MCA_bus 0
/*
* The m68k has no problems with write protection
*/
#define wp_works_ok__is_a_macro 1
#define wp_works_ok 1
/* MAX floating point unit state size (FSAVE/FRESTORE) */
#define FPSTATESIZE (216/sizeof(unsigned char))
......@@ -42,8 +34,6 @@ struct thread_struct {
unsigned long usp; /* user stack pointer */
unsigned short sr; /* saved status register */
unsigned short fs; /* saved fs (sfc, dfc) */
unsigned long *pagedir_v; /* root page table virtual addr */
unsigned long pagedir_p; /* root page table physaddr */
unsigned long crp[2]; /* cpu root pointer */
unsigned long esp0; /* points to SR of stack frame */
unsigned long fp[8*3];
......@@ -56,7 +46,7 @@ struct thread_struct {
#define INIT_TSS { \
sizeof(init_kernel_stack) + (long) init_kernel_stack, 0, \
PS_S, KERNEL_DS, \
NULL, 0, {0, 0}, 0 \
{0, 0}, 0, {0,}, {0, 0, 0}, {0,}, \
}
#define alloc_kernel_stack() __get_free_page(GFP_KERNEL)
......
include/asm-m68k/segment.h
View file @ 832c29d4
......@@ -17,322 +17,6 @@
#ifndef __ASSEMBLY__
/*
* Uh, these should become the main single-value transfer routines..
* They automatically use the right size if we just have the right
* pointer type..
*/
#define put_user(x,ptr) __put_user((unsigned long)(x),(ptr),sizeof(*(ptr)))
#define get_user(ptr) ((__typeof__(*(ptr)))__get_user((ptr),sizeof(*(ptr))))
/*
* This is a silly but good way to make sure that
* the __put_user function is indeed always optimized,
* and that we use the correct sizes..
*/
extern int bad_user_access_length(void);
#define __ptr(x) ((unsigned long *)(x))
static inline void __put_user(unsigned long x, void * y, int size)
{
switch (size) {
case 1:
__asm__ ("movesb %0,%1"
: /* no outputs */
:"r" (x),"m" (*__ptr(y)) : "memory");
break;
case 2:
__asm__ ("movesw %0,%1"
: /* no outputs */
:"r" (x),"m" (*__ptr(y)) : "memory");
break;
case 4:
__asm__ ("movesl %0,%1"
: /* no outputs */
:"r" (x),"m" (*__ptr(y)) : "memory");
break;
default:
bad_user_access_length();
}
}
static inline unsigned long __get_user(const void * y, int size)
{
unsigned long result;
switch (size) {
case 1:
__asm__ ("movesb %1,%0"
:"=r" (result)
:"m" (*__ptr(y)));
return (unsigned char) result;
case 2:
__asm__ ("movesw %1,%0"
:"=r" (result)
:"m" (*__ptr(y)));
return (unsigned short) result;
case 4:
__asm__ ("movesl %1,%0"
:"=r" (result)
:"m" (*__ptr(y)));
return result;
default:
return bad_user_access_length();
}
}
#undef __ptr
/*
* These are deprecated..
*
* Use "put_user()" and "get_user()" with the proper pointer types instead.
*/
#define get_fs_byte(addr) __get_user((const unsigned char *)(addr),1)
#define get_fs_word(addr) __get_user((const unsigned short *)(addr),2)
#define get_fs_long(addr) __get_user((const unsigned int *)(addr),4)
#define put_fs_byte(x,addr) __put_user((x),(unsigned char *)(addr),1)
#define put_fs_word(x,addr) __put_user((x),(unsigned short *)(addr),2)
#define put_fs_long(x,addr) __put_user((x),(unsigned int *)(addr),4)
#ifdef WE_REALLY_WANT_TO_USE_A_BROKEN_INTERFACE
static inline unsigned char get_user_byte(const char * addr)
{
return __get_user(addr,1);
}
static inline unsigned short get_user_word(const short *addr)
{
return __get_user(addr,2);
}
static inline unsigned long get_user_long(const int *addr)
{
return __get_user(addr,4);
}
static inline void put_user_byte(char val,char *addr)
{
__put_user(val, addr, 1);
}
static inline void put_user_word(short val,short * addr)
{
__put_user(val, addr, 2);
}
static inline void put_user_long(unsigned long val,int * addr)
{
__put_user(val, addr, 4);
}
#endif
static inline void __generic_memcpy_tofs(void * to, const void * from, unsigned long n)
{
unsigned long tmp;
if (n == 0) return;
tmp = n;
n >>= 2;
if (n != 0)
__asm__ __volatile__ ("1:\t"
"movel %1@+,%/d0\n\t"
"movesl %/d0,%2@+\n\t"
"dbra %0,1b\n\t"
"clrw %0\n\t"
"subql #1,%0\n\t"
"bccs 1b\n\t"
: "=d" (n), "=a" (from), "=a" (to)
: "0" (n-1), "1" (from), "2" (to)
: "d0", "memory");
if (tmp & 2)
__asm__ __volatile__ ("movew %0@+,%/d0\n\t"
"movesw %/d0,%1@+\n\t"
: "=a" (from), "=a" (to)
: "0" (from), "1" (to)
: "d0", "memory");
if (tmp & 1)
__asm__ __volatile__ ("moveb %0@,%/d0\n\t"
"movesb %/d0,%1@\n\t"
: /* no outputs */
: "a" (from), "a" (to)
: "d0", "memory");
}
static inline void __constant_memcpy_tofs(void * to, const void * from, unsigned long n)
{
switch (n) {
case 0:
return;
case 1:
__put_user(*(const char *) from, (char *) to, 1);
return;
case 2:
__put_user(*(const short *) from, (short *) to, 2);
return;
case 3:
__put_user(*(const short *) from, (short *) to, 2);
__put_user(*(2+(const char *) from), 2+(char *) to, 1);
return;
case 4:
__put_user(*(const int *) from, (int *) to, 4);
return;
case 8:
__put_user(*(const int *) from, (int *) to, 4);
__put_user(*(1+(const int *) from), 1+(int *) to, 4);
return;
case 12:
__put_user(*(const int *) from, (int *) to, 4);
__put_user(*(1+(const int *) from), 1+(int *) to, 4);
__put_user(*(2+(const int *) from), 2+(int *) to, 4);
return;
case 16:
__put_user(*(const int *) from, (int *) to, 4);
__put_user(*(1+(const int *) from), 1+(int *) to, 4);
__put_user(*(2+(const int *) from), 2+(int *) to, 4);
__put_user(*(3+(const int *) from), 3+(int *) to, 4);
return;
}
#define COMMON(x) \
__asm__ __volatile__ ("1:\n\t" \
"movel %1@+,%/d0\n\t" \
"movesl %/d0,%2@+\n\t" \
"dbra %0,1b\n\t" \
"clrw %0\n\t" \
"subql #1,%0\n\t" \
"bccs 1b\n\t" \
x \
: "=d" (n), "=a" (from), "=a" (to) \
: "1" (from), "2" (to), "0" (n/4-1) \
: "d0", "memory");
switch (n % 4) {
case 0:
COMMON("");
return;
case 1:
COMMON("moveb %1@+,%/d0; movesb %/d0,%2@+");
return;
case 2:
COMMON("movew %1@+,%/d0; movesw %/d0,%2@+");
return;
case 3:
COMMON("movew %1@+,%/d0; movesw %/d0,%2@+\n\t"
"moveb %1@+,%/d0; movesb %/d0,%2@+");
return;
}
#undef COMMON
}
static inline void __generic_memcpy_fromfs(void * to, const void * from, unsigned long n)
{
unsigned long tmp;
if (n == 0) return;
tmp = n;
n >>= 2;
if (n != 0)
__asm__ __volatile__ ("1:\t"
"movesl %1@+,%/d0\n\t"
"movel %/d0,%2@+\n\t"
"dbra %0,1b\n\t"
"clrw %0\n\t"
"subql #1,%0\n\t"
"bccs 1b\n\t"
: "=d" (n), "=a" (from), "=a" (to)
: "0" (n-1), "1" (from), "2" (to)
: "d0", "memory");
if (tmp & 2)
__asm__ __volatile__ ("movesw %0@+,%/d0\n\t"
"movew %/d0,%1@+\n\t"
: "=a" (from), "=a" (to)
: "0" (from), "1" (to)
: "d0", "memory");
if (tmp & 1)
__asm__ __volatile__ ("movesb %0@,%/d0\n\t"
"moveb %/d0,%1@\n\t"
: /* no outputs */
: "a" (from), "a" (to)
: "d0", "memory");
}
static inline void __constant_memcpy_fromfs(void * to, const void * from, unsigned long n)
{
switch (n) {
case 0:
return;
case 1:
*(char *)to = __get_user((const char *) from, 1);
return;
case 2:
*(short *)to = __get_user((const short *) from, 2);
return;
case 3:
*(short *) to = __get_user((const short *) from, 2);
*((char *) to + 2) = __get_user(2+(const char *) from, 1);
return;
case 4:
*(int *) to = __get_user((const int *) from, 4);
return;
case 8:
*(int *) to = __get_user((const int *) from, 4);
*(1+(int *) to) = __get_user(1+(const int *) from, 4);
return;
case 12:
*(int *) to = __get_user((const int *) from, 4);
*(1+(int *) to) = __get_user(1+(const int *) from, 4);
*(2+(int *) to) = __get_user(2+(const int *) from, 4);
return;
case 16:
*(int *) to = __get_user((const int *) from, 4);
*(1+(int *) to) = __get_user(1+(const int *) from, 4);
*(2+(int *) to) = __get_user(2+(const int *) from, 4);
*(3+(int *) to) = __get_user(3+(const int *) from, 4);
return;
}
#define COMMON(x) \
__asm__ __volatile__ ("1:\n\t" \
"movesl %1@+,%/d0\n\t" \
"movel %/d0,%2@+\n\t" \
"dbra %0,1b\n\t" \
"clrw %0\n\t" \
"subql #1,%0\n\t" \
"bccs 1b\n\t" \
x \
: "=d" (n), "=a" (from), "=a" (to) \
: "1" (from), "2" (to), "0" (n/4-1) \
: "d0", "memory");
switch (n % 4) {
case 0:
COMMON("");
return;
case 1:
COMMON("movesb %1@+,%/d0; moveb %/d0,%2@+");
return;
case 2:
COMMON("movesw %1@+,%/d0; movew %/d0,%2@+");
return;
case 3:
COMMON("movesw %1@+,%/d0; movew %/d0,%2@+\n\t"
"movesb %1@+,%/d0; moveb %/d0,%2@+");
return;
}
#undef COMMON
}
#define memcpy_fromfs(to, from, n) \
(__builtin_constant_p(n) ? \
__constant_memcpy_fromfs((to),(from),(n)) : \
__generic_memcpy_fromfs((to),(from),(n)))
#define memcpy_tofs(to, from, n) \
(__builtin_constant_p(n) ? \
__constant_memcpy_tofs((to),(from),(n)) : \
__generic_memcpy_tofs((to),(from),(n)))
/*
* Get/set the SFC/DFC registers for MOVES instructions
*/
......
include/asm-m68k/semaphore.h
View file @ 832c29d4
......@@ -20,8 +20,8 @@ struct semaphore {
#define MUTEX ((struct semaphore) { 1, 0, NULL })
#define MUTEX_LOCKED ((struct semaphore) { 0, 0, NULL })
asmlinkage void down_failed(void /* special register calling convention */);
asmlinkage void up_wakeup(void /* special register calling convention */);
asmlinkage void __down_failed(void /* special register calling convention */);
asmlinkage void __up_wakeup(void /* special register calling convention */);
extern void __down(struct semaphore * sem);
extern void __up(struct semaphore * sem);
......@@ -35,14 +35,14 @@ extern inline void down(struct semaphore * sem)
{
register struct semaphore *sem1 __asm__ ("%a1") = sem;
__asm__ __volatile__(
"# atomic down operation\n"
"1:\n\t"
"lea %%pc@(1b),%%a0\n\t"
"| atomic down operation\n\t"
"lea %%pc@(1f),%%a0\n\t"
"subql #1,%0\n\t"
"jmi " SYMBOL_NAME_STR(down_failed)
"jmi " SYMBOL_NAME_STR(__down_failed) "\n"
"1:"
: /* no outputs */
: "m" (sem->count), "a" (sem1)
: "%a0", "%d0", "%d1", "memory");
: "%a0", "memory");
}
/*
......@@ -55,14 +55,14 @@ extern inline void up(struct semaphore * sem)
{
register struct semaphore *sem1 __asm__ ("%a1") = sem;
__asm__ __volatile__(
"# atomic up operation\n\t"
"| atomic up operation\n\t"
"lea %%pc@(1f),%%a0\n\t"
"addql #1,%0\n\t"
"jls " SYMBOL_NAME_STR(up_wakeup) "\n"
"jle " SYMBOL_NAME_STR(__up_wakeup) "\n"
"1:"
: /* no outputs */
: "m" (sem->count), "a" (sem1)
: "%a0", "%d0", "%d1", "memory");
: "%a0", "memory");
}
#endif
include/asm-m68k/sigcontext.h
View file @ 832c29d4
#ifndef _ASMm68k_SIGCONTEXT_H
#define _ASMm68k_SIGCONTEXT_H
#ifndef _ASM_M68k_SIGCONTEXT_H
#define _ASM_M68k_SIGCONTEXT_H
struct sigcontext_struct {
struct sigcontext {
unsigned long sc_mask; /* old sigmask */
unsigned long sc_usp; /* old user stack pointer */
unsigned long sc_d0;
......
include/asm-m68k/stat.h
View file @ 832c29d4
#ifndef _M68K_STAT_H
#define _M68K_STAT_H
struct old_stat {
struct __old_kernel_stat {
unsigned short st_dev;
unsigned short st_ino;
unsigned short st_mode;
......@@ -15,7 +15,7 @@ struct old_stat {
unsigned long st_ctime;
};
struct new_stat {
struct stat {
unsigned short st_dev;
unsigned short __pad1;
unsigned long st_ino;
......
include/asm-m68k/uaccess.h 0 → 100644
View file @ 832c29d4
This diff is collapsed.
include/asm-m68k/unistd.h
View file @ 832c29d4
This diff is collapsed.
include/asm-m68k/user.h
View file @ 832c29d4
......@@ -35,14 +35,30 @@ struct user_m68kfp_struct {
unsigned long fpcntl[3]; /* fp control regs */
};
/* This is the old layout of "struct pt_regs" as of Linux 1.x, and
is still the layout used by user (the new pt_regs doesn't have
all registers). */
struct user_regs_struct {
long d1,d2,d3,d4,d5,d6,d7;
long a0,a1,a2,a3,a4,a5,a6;
long d0;
long usp;
long orig_d0;
short stkadj;
short sr;
long pc;
short fmtvec;
short __fill;
};
/* When the kernel dumps core, it starts by dumping the user struct -
this will be used by gdb to figure out where the data and stack segments
are within the file, and what virtual addresses to use. */
struct user{
/* We start with the registers, to mimic the way that "memory" is returned
from the ptrace(3,...) function. */
struct pt_regs regs; /* Where the registers are actually stored */
struct switch_stack regs2; /* Backward compatibility, sort of */
struct user_regs_struct regs; /* Where the registers are actually stored */
/* ptrace does not yet supply these. Someday.... */
int u_fpvalid; /* True if math co-processor being used. */
/* for this mess. Not yet used. */
......
include/asm-m68k/zorro.h
View file @ 832c29d4
......@@ -355,7 +355,7 @@
#define PROD_BLIZZARD_1230_III (0x0D) /* Blizzard 1230-III Turbo Board */
#define PROD_BLIZZARD_1230_IV (0x11) /* Blizzard 1230-IV/1260 Turbo Board */
#define PROD_BLIZZARD_2060SCSI (0x18) /* Blizzard 2060 SCSI Controller */
#define PROD_CYBERSTORM (0x19) /* CyberStorm */
#define PROD_CYBERSTORM_II (0x19) /* CyberStorm Mk II */
#define PROD_CYBERVISION (0x22) /* CyberVision64 Graphics Board */
#define MANUF_DPS (0x2169) /* DPS */
......
include/linux/binfmts.h
View file @ 832c29d4
......@@ -18,6 +18,7 @@ struct linux_binprm{
unsigned long page[MAX_ARG_PAGES];
unsigned long p;
int sh_bang;
int java; /* Java binary, prevent recursive invocation */
struct inode * inode;
int e_uid, e_gid;
int argc, envc;
......
include/linux/mm.h
View file @ 832c29d4
......@@ -308,10 +308,12 @@ static inline int expand_stack(struct vm_area_struct * vma, unsigned long addres
unsigned long grow;
address &= PAGE_MASK;
grow = vma->vm_start - address;
if (vma->vm_end - address
> (unsigned long) current->rlim[RLIMIT_STACK].rlim_cur)
> (unsigned long) current->rlim[RLIMIT_STACK].rlim_cur ||
(vma->vm_mm->total_vm << PAGE_SHIFT) + grow
> (unsigned long) current->rlim[RLIMIT_AS].rlim_cur)
return -ENOMEM;
grow = vma->vm_start - address;
vma->vm_start = address;
vma->vm_offset -= grow;
vma->vm_mm->total_vm += grow >> PAGE_SHIFT;
......
include/linux/nfs_fs.h
View file @ 832c29d4
......@@ -103,7 +103,7 @@ extern int nfs_proc_read_request(struct rpc_ioreq *, struct nfs_server *,
unsigned long count, __u32 *buf);
extern int nfs_proc_read_reply(struct rpc_ioreq *, struct nfs_fattr *);
extern int *rpc_header(int *p, int procedure, int program, int version,
int uid, int gid, int *groups);
int uid, int gid, int ngroup, gid_t *groups);
extern int *rpc_verify(int *p);
/* linux/fs/nfs/sock.c */
......
include/linux/pci.h
View file @ 832c29d4
......@@ -532,6 +532,8 @@
#define PCI_VENDOR_ID_S3 0x5333
#define PCI_DEVICE_ID_S3_ViRGE 0x5631
#define PCI_DEVICE_ID_S3_TRIO 0x8811
#define PCI_DEVICE_ID_S3_AURORA64VP 0x8812
#define PCI_DEVICE_ID_S3_TRIO64UVP 0x8814
#define PCI_DEVICE_ID_S3_ViRGE_VX 0x883d
#define PCI_DEVICE_ID_S3_868 0x8880
#define PCI_DEVICE_ID_S3_928 0x88b0
......
include/linux/sched.h
View file @ 832c29d4
......@@ -200,7 +200,8 @@ struct task_struct {
int session;
/* boolean value for session group leader */
int leader;
int groups[NGROUPS];
int ngroups;
gid_t groups[NGROUPS];
/*
* pointers to (original) parent process, youngest child, younger sibling,
* older sibling, respectively. (p->father can be replaced with
......@@ -290,7 +291,7 @@ struct task_struct {
/* stack */ 0,(unsigned long) &init_kernel_stack, \
/* ec,brk... */ 0,0,0,0,0, \
/* pid etc.. */ 0,0,0,0,0, \
/* suppl grps*/ {NOGROUP,}, \
/* suppl grps*/ 0, {0,}, \
/* proc links*/ &init_task,&init_task,NULL,NULL,NULL,NULL, \
/* uid etc */ 0,0,0,0,0,0,0,0, \
/* timeout */ 0,SCHED_OTHER,0,0,0,0,0,0,0, \
......
include/linux/socket.h
View file @ 832c29d4
This diff is collapsed.
include/linux/sysctl.h
View file @ 832c29d4
This diff is collapsed.
include/linux/ucdrom.h
View file @ 832c29d4
This diff is collapsed.
include/net/sock.h
View file @ 832c29d4
This diff is collapsed.
include/net/transp_v6.h
View file @ 832c29d4
This diff is collapsed.
include/net/x25call.h 0 → 100644
View file @ 832c29d4
/* Separate to keep compilation of protocols.c simpler */
extern void x25_proto_init(struct net_proto *pro);
ipc/shm.c
View file @ 832c29d4
This diff is collapsed.
kernel/module.c
View file @ 832c29d4
This diff is collapsed.
kernel/sys.c
View file @ 832c29d4
This diff is collapsed.
kernel/sysctl.c
View file @ 832c29d4
This diff is collapsed.
mm/mmap.c
View file @ 832c29d4
This diff is collapsed.
mm/mremap.c
View file @ 832c29d4
This diff is collapsed.
net/Config.in
View file @ 832c29d4
This diff is collapsed.
net/ax25/af_ax25.c
View file @ 832c29d4
This diff is collapsed.
net/ax25/ax25_in.c
View file @ 832c29d4
This diff is collapsed.
net/ax25/ax25_out.c
View file @ 832c29d4
This diff is collapsed.
net/ax25/ax25_route.c
View file @ 832c29d4
This diff is collapsed.
net/ax25/ax25_timer.c
View file @ 832c29d4
This diff is collapsed.
net/ipv4/ip_output.c
View file @ 832c29d4
This diff is collapsed.
net/ipv4/tcp_timer.c
View file @ 832c29d4
This diff is collapsed.
net/ipv6/addrconf.c
View file @ 832c29d4
This diff is collapsed.
net/ipv6/ipv6_route.c
View file @ 832c29d4
This diff is collapsed.
net/ipv6/sit.c
View file @ 832c29d4
This diff is collapsed.
net/ipv6/udp.c
View file @ 832c29d4
This diff is collapsed.
net/netrom/af_netrom.c
View file @ 832c29d4
This diff is collapsed.
net/netrom/nr_in.c
View file @ 832c29d4
This diff is collapsed.
net/netrom/nr_out.c
View file @ 832c29d4
This diff is collapsed.
net/netrom/nr_timer.c
View file @ 832c29d4
This diff is collapsed.
net/netsyms.c
View file @ 832c29d4
This diff is collapsed.
net/protocols.c
View file @ 832c29d4
This diff is collapsed.
net/rose/af_rose.c
View file @ 832c29d4
This diff is collapsed.
net/rose/rose_in.c
View file @ 832c29d4
This diff is collapsed.
net/rose/rose_timer.c
View file @ 832c29d4
This diff is collapsed.
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7