Skip to content

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Fix misspellings in comments.
  m68k: Use conventional function parameters for do_sigreturn
  zorro: Use kobj_to_dev()
parents 72aafdf0 efbec135
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 22 deletions
arch/m68k/include/asm/MC68328.h
View file @ aa6865d8
...@@ -798,7 +798,7 @@ ...@@ -798,7 +798,7 @@
/********** /**********
* *
* 0xFFFFF7xx -- Serial Periferial Interface Slave (SPIS) * 0xFFFFF7xx -- Serial Peripheral Interface Slave (SPIS)
* *
**********/ **********/
...@@ -824,7 +824,7 @@ ...@@ -824,7 +824,7 @@
/********** /**********
* *
* 0xFFFFF8xx -- Serial Periferial Interface Master (SPIM) * 0xFFFFF8xx -- Serial Peripheral Interface Master (SPIM)
* *
**********/ **********/
...@@ -904,7 +904,7 @@ ...@@ -904,7 +904,7 @@
#define UBAUD_PRESCALER_MASK 0x003f /* Actual divisor is 65 - PRESCALER */ #define UBAUD_PRESCALER_MASK 0x003f /* Actual divisor is 65 - PRESCALER */
#define UBAUD_PRESCALER_SHIFT 0 #define UBAUD_PRESCALER_SHIFT 0
#define UBAUD_DIVIDE_MASK 0x0700 /* Baud Rate freq. divizor */ #define UBAUD_DIVIDE_MASK 0x0700 /* Baud Rate freq. divisor */
#define UBAUD_DIVIDE_SHIFT 8 #define UBAUD_DIVIDE_SHIFT 8
#define UBAUD_BAUD_SRC 0x0800 /* Baud Rate Source */ #define UBAUD_BAUD_SRC 0x0800 /* Baud Rate Source */
#define UBAUD_GPIOSRC 0x1000 /* GPIO source */ #define UBAUD_GPIOSRC 0x1000 /* GPIO source */
......
arch/m68k/include/asm/MC68EZ328.h
View file @ aa6865d8
...@@ -631,7 +631,7 @@ ...@@ -631,7 +631,7 @@
/********** /**********
* *
* 0xFFFFF8xx -- Serial Periferial Interface Master (SPIM) * 0xFFFFF8xx -- Serial Peripheral Interface Master (SPIM)
* *
**********/ **********/
...@@ -712,7 +712,7 @@ ...@@ -712,7 +712,7 @@
#define UBAUD_PRESCALER_MASK 0x003f /* Actual divisor is 65 - PRESCALER */ #define UBAUD_PRESCALER_MASK 0x003f /* Actual divisor is 65 - PRESCALER */
#define UBAUD_PRESCALER_SHIFT 0 #define UBAUD_PRESCALER_SHIFT 0
#define UBAUD_DIVIDE_MASK 0x0700 /* Baud Rate freq. divizor */ #define UBAUD_DIVIDE_MASK 0x0700 /* Baud Rate freq. divisor */
#define UBAUD_DIVIDE_SHIFT 8 #define UBAUD_DIVIDE_SHIFT 8
#define UBAUD_BAUD_SRC 0x0800 /* Baud Rate Source */ #define UBAUD_BAUD_SRC 0x0800 /* Baud Rate Source */
#define UBAUD_UCLKDIR 0x2000 /* UCLK Direction */ #define UBAUD_UCLKDIR 0x2000 /* UCLK Direction */
...@@ -1160,7 +1160,7 @@ typedef volatile struct { ...@@ -1160,7 +1160,7 @@ typedef volatile struct {
#define DRAMMC_COL10 0x0080 /* Col address bit for MD10 PA11/PA0 */ #define DRAMMC_COL10 0x0080 /* Col address bit for MD10 PA11/PA0 */
#define DRAMMC_COL9 0x0040 /* Col address bit for MD9 PA10/PA0 */ #define DRAMMC_COL9 0x0040 /* Col address bit for MD9 PA10/PA0 */
#define DRAMMC_COL8 0x0020 /* Col address bit for MD8 PA9/PA0 */ #define DRAMMC_COL8 0x0020 /* Col address bit for MD8 PA9/PA0 */
#define DRAMMC_REF_MASK 0x001f /* Reresh Cycle */ #define DRAMMC_REF_MASK 0x001f /* Refresh Cycle */
#define DRAMMC_REF_SHIFT 0 #define DRAMMC_REF_SHIFT 0
/* /*
......
arch/m68k/include/asm/MC68VZ328.h
View file @ aa6865d8
...@@ -724,7 +724,7 @@ ...@@ -724,7 +724,7 @@
/********** /**********
* *
* 0xFFFFF8xx -- Serial Periferial Interface Master (SPIM) * 0xFFFFF8xx -- Serial Peripheral Interface Master (SPIM)
* *
**********/ **********/
...@@ -806,7 +806,7 @@ ...@@ -806,7 +806,7 @@
#define UBAUD_PRESCALER_MASK 0x003f /* Actual divisor is 65 - PRESCALER */ #define UBAUD_PRESCALER_MASK 0x003f /* Actual divisor is 65 - PRESCALER */
#define UBAUD_PRESCALER_SHIFT 0 #define UBAUD_PRESCALER_SHIFT 0
#define UBAUD_DIVIDE_MASK 0x0700 /* Baud Rate freq. divizor */ #define UBAUD_DIVIDE_MASK 0x0700 /* Baud Rate freq. divisor */
#define UBAUD_DIVIDE_SHIFT 8 #define UBAUD_DIVIDE_SHIFT 8
#define UBAUD_BAUD_SRC 0x0800 /* Baud Rate Source */ #define UBAUD_BAUD_SRC 0x0800 /* Baud Rate Source */
#define UBAUD_UCLKDIR 0x2000 /* UCLK Direction */ #define UBAUD_UCLKDIR 0x2000 /* UCLK Direction */
...@@ -1256,7 +1256,7 @@ typedef struct { ...@@ -1256,7 +1256,7 @@ typedef struct {
#define DRAMMC_COL10 0x0080 /* Col address bit for MD10 PA11/PA0 */ #define DRAMMC_COL10 0x0080 /* Col address bit for MD10 PA11/PA0 */
#define DRAMMC_COL9 0x0040 /* Col address bit for MD9 PA10/PA0 */ #define DRAMMC_COL9 0x0040 /* Col address bit for MD9 PA10/PA0 */
#define DRAMMC_COL8 0x0020 /* Col address bit for MD8 PA9/PA0 */ #define DRAMMC_COL8 0x0020 /* Col address bit for MD8 PA9/PA0 */
#define DRAMMC_REF_MASK 0x001f /* Reresh Cycle */ #define DRAMMC_REF_MASK 0x001f /* Refresh Cycle */
#define DRAMMC_REF_SHIFT 0 #define DRAMMC_REF_SHIFT 0
/* /*
......
arch/m68k/include/asm/m54xxacr.h
View file @ aa6865d8
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
#define CACR_IEC 0x00008000 /* Enable instruction cache */ #define CACR_IEC 0x00008000 /* Enable instruction cache */
#define CACR_DNFB 0x00002000 /* Inhibited fill buffer */ #define CACR_DNFB 0x00002000 /* Inhibited fill buffer */
#define CACR_IDPI 0x00001000 /* Disable CPUSHL */ #define CACR_IDPI 0x00001000 /* Disable CPUSHL */
#define CACR_IHLCK 0x00000800 /* Intruction cache half lock */ #define CACR_IHLCK 0x00000800 /* Instruction cache half lock */
#define CACR_IDCM 0x00000400 /* Intruction cache inhibit */ #define CACR_IDCM 0x00000400 /* Instruction cache inhibit */
#define CACR_ICINVA 0x00000100 /* Invalidate instr cache */ #define CACR_ICINVA 0x00000100 /* Invalidate instr cache */
#define CACR_EUSP 0x00000020 /* Enable separate user a7 */ #define CACR_EUSP 0x00000020 /* Enable separate user a7 */
......
arch/m68k/include/asm/mac_iop.h
View file @ aa6865d8
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
/* IOP message status codes */ /* IOP message status codes */
#define IOP_MSGSTATUS_UNUSED 0 /* Unusued message structure */ #define IOP_MSGSTATUS_UNUSED 0 /* Unused message structure */
#define IOP_MSGSTATUS_WAITING 1 /* waiting for channel */ #define IOP_MSGSTATUS_WAITING 1 /* waiting for channel */
#define IOP_MSGSTATUS_SENT 2 /* message sent, awaiting reply */ #define IOP_MSGSTATUS_SENT 2 /* message sent, awaiting reply */
#define IOP_MSGSTATUS_COMPLETE 3 /* message complete and reply rcvd */ #define IOP_MSGSTATUS_COMPLETE 3 /* message complete and reply rcvd */
......
arch/m68k/include/asm/mcftimer.h
View file @ aa6865d8
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
* Bit definitions for the Timer Event Registers (TER). * Bit definitions for the Timer Event Registers (TER).
*/ */
#define MCFTIMER_TER_CAP 0x01 /* Capture event */ #define MCFTIMER_TER_CAP 0x01 /* Capture event */
#define MCFTIMER_TER_REF 0x02 /* Refernece event */ #define MCFTIMER_TER_REF 0x02 /* Reference event */
/****************************************************************************/ /****************************************************************************/
#endif /* mcftimer_h */ #endif /* mcftimer_h */
arch/m68k/kernel/entry.S
View file @ aa6865d8
...@@ -71,13 +71,19 @@ ENTRY(__sys_vfork) ...@@ -71,13 +71,19 @@ ENTRY(__sys_vfork)
ENTRY(sys_sigreturn) ENTRY(sys_sigreturn)
SAVE_SWITCH_STACK SAVE_SWITCH_STACK
movel %sp,%sp@- | switch_stack pointer
pea %sp@(SWITCH_STACK_SIZE+4) | pt_regs pointer
jbsr do_sigreturn jbsr do_sigreturn
addql #8,%sp
RESTORE_SWITCH_STACK RESTORE_SWITCH_STACK
rts rts
ENTRY(sys_rt_sigreturn) ENTRY(sys_rt_sigreturn)
SAVE_SWITCH_STACK SAVE_SWITCH_STACK
movel %sp,%sp@- | switch_stack pointer
pea %sp@(SWITCH_STACK_SIZE+4) | pt_regs pointer
jbsr do_rt_sigreturn jbsr do_rt_sigreturn
addql #8,%sp
RESTORE_SWITCH_STACK RESTORE_SWITCH_STACK
rts rts
......
arch/m68k/kernel/signal.c
View file @ aa6865d8
...@@ -737,10 +737,8 @@ rt_restore_ucontext(struct pt_regs *regs, struct switch_stack *sw, ...@@ -737,10 +737,8 @@ rt_restore_ucontext(struct pt_regs *regs, struct switch_stack *sw,
return 1; return 1;
} }
asmlinkage int do_sigreturn(unsigned long __unused) asmlinkage int do_sigreturn(struct pt_regs *regs, struct switch_stack *sw)
{ {
struct switch_stack *sw = (struct switch_stack *) &__unused;
struct pt_regs *regs = (struct pt_regs *) (sw + 1);
unsigned long usp = rdusp(); unsigned long usp = rdusp();
struct sigframe __user *frame = (struct sigframe __user *)(usp - 4); struct sigframe __user *frame = (struct sigframe __user *)(usp - 4);
sigset_t set; sigset_t set;
...@@ -764,10 +762,8 @@ asmlinkage int do_sigreturn(unsigned long __unused) ...@@ -764,10 +762,8 @@ asmlinkage int do_sigreturn(unsigned long __unused)
return 0; return 0;
} }
asmlinkage int do_rt_sigreturn(unsigned long __unused) asmlinkage int do_rt_sigreturn(struct pt_regs *regs, struct switch_stack *sw)
{ {
struct switch_stack *sw = (struct switch_stack *) &__unused;
struct pt_regs *regs = (struct pt_regs *) (sw + 1);
unsigned long usp = rdusp(); unsigned long usp = rdusp();
struct rt_sigframe __user *frame = (struct rt_sigframe __user *)(usp - 4); struct rt_sigframe __user *frame = (struct rt_sigframe __user *)(usp - 4);
sigset_t set; sigset_t set;
......
arch/m68k/mac/via.c
View file @ aa6865d8
...@@ -68,7 +68,7 @@ static int gIER,gIFR,gBufA,gBufB; ...@@ -68,7 +68,7 @@ static int gIER,gIFR,gBufA,gBufB;
* interrupt. This limitation also seems to apply to VIA clone logic cores in * interrupt. This limitation also seems to apply to VIA clone logic cores in
* Quadra-like ASICs. (RBV and OSS machines don't have this limitation.) * Quadra-like ASICs. (RBV and OSS machines don't have this limitation.)
* *
* We used to fake it by configuring the relevent VIA pin as an output * We used to fake it by configuring the relevant VIA pin as an output
* (to mask the interrupt) or input (to unmask). That scheme did not work on * (to mask the interrupt) or input (to unmask). That scheme did not work on
* (at least) the Quadra 700. A NuBus card's /NMRQ signal is an open-collector * (at least) the Quadra 700. A NuBus card's /NMRQ signal is an open-collector
* circuit (see Designing Cards and Drivers for Macintosh II and Macintosh SE, * circuit (see Designing Cards and Drivers for Macintosh II and Macintosh SE,
......
drivers/zorro/zorro-sysfs.c
View file @ aa6865d8
...@@ -65,8 +65,7 @@ static ssize_t zorro_read_config(struct file *filp, struct kobject *kobj, ...@@ -65,8 +65,7 @@ static ssize_t zorro_read_config(struct file *filp, struct kobject *kobj,
struct bin_attribute *bin_attr, struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count) char *buf, loff_t off, size_t count)
{ {
struct zorro_dev *z = to_zorro_dev(container_of(kobj, struct device, struct zorro_dev *z = to_zorro_dev(kobj_to_dev(kobj));
kobj));
struct ConfigDev cd; struct ConfigDev cd;
/* Construct a ConfigDev */ /* Construct a ConfigDev */
......
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