Commit bca2a25d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sparc-for-6.10-tag1' of... 

Merge tag 'sparc-for-6.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc

Pull sparc updates from Andreas Larsson:

 - Avoid on-stack cpumask variables in a number of places

 - Move struct termio to asm/termios.h, matching other architectures and
   allowing certain user space applications to build also for sparc

 - Fix missing prototype warnings for sparc64

 - Fix version generation warnings for sparc32

 - Fix bug where non-consecutive CPU IDs lead to some CPUs not starting

 - Simplification using swap and cleanup using NULL for pointer

 - Convert sparc parport and chmc drivers to use remove callbacks
   returning void

* tag 'sparc-for-6.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc:
  sparc/leon: Remove on-stack cpumask var
  sparc/pci_msi: Remove on-stack cpumask var
  sparc/of: Remove on-stack cpumask var
  sparc/irq: Remove on-stack cpumask var
  sparc/srmmu: Remove on-stack cpumask var
  sparc: chmc: Convert to platform remove callback returning void
  sparc: parport: Convert to platform remove callback returning void
  sparc: Compare pointers to NULL instead of 0
  sparc: Use swap() to fix Coccinelle warning
  sparc32: Fix version generation failed warnings
  sparc64: Fix number of online CPUs
  sparc64: Fix prototype warning for sched_clock
  sparc64: Fix prototype warnings in adi_64.c
  sparc64: Fix prototype warning for dma_4v_iotsb_bind
  sparc64: Fix prototype warning for uprobe_trap
  sparc64: Fix prototype warning for alloc_irqstack_bootmem
  sparc64: Fix prototype warning for vmemmap_free
  sparc64: Fix prototype warnings in traps_64.c
  sparc64: Fix prototype warning for init_vdso_image
  sparc: move struct termio to asm/termios.h
parents 2b7ced10 1c9e709c

arch/sparc/include/asm/asm-prototypes.h

+12 −5
Original line number Diff line number Diff line
@@ -3,15 +3,18 @@ 
 * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.

 */



#include <asm/xor.h>

#include <asm/checksum.h>

#include <asm/trap_block.h>

#include <linux/atomic.h>

#include <linux/uaccess.h>



#include <asm/atomic.h>

#include <asm/ftrace.h>

#include <asm/cacheflush.h>

#include <asm/checksum.h>

#include <asm/delay.h>

#include <asm/ftrace.h>

#include <asm/oplib.h>

#include <linux/atomic.h>

#include <asm/pgtable.h>

#include <asm/trap_block.h>

#include <asm/xor.h>



void *__memscan_zero(void *, size_t);

void *__memscan_generic(void *, int, size_t);
@@ -23,3 +26,7 @@ void *memcpy(void *dest, const void *src, size_t n); 
void *memset(void *s, int c, size_t n);

typedef int TItype __attribute__((mode(TI)));

TItype __multi3(TItype a, TItype b);



s64 __ashldi3(s64, int);

s64 __lshrdi3(s64, int);

s64 __ashrdi3(s64, int);

arch/sparc/include/asm/floppy_64.h

+1 −3
Original line number Diff line number Diff line
@@ -704,9 +704,7 @@ static unsigned long __init sun_floppy_init(void) 
			ns87303_modify(config, ASC, ASC_DRV2_SEL, 0);

			ns87303_modify(config, FCR, 0, FCR_LDE);



			config = sun_floppy_types[0];

			sun_floppy_types[0] = sun_floppy_types[1];

			sun_floppy_types[1] = config;

			swap(sun_floppy_types[0], sun_floppy_types[1]);



			if (sun_pci_broken_drive != -1) {

				sun_pci_broken_drive = 1 - sun_pci_broken_drive;

arch/sparc/include/asm/parport_64.h

+2 −4
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static int ecpp_probe(struct platform_device *op) 
	return err;

}



static int ecpp_remove(struct platform_device *op)

static void ecpp_remove(struct platform_device *op)

{

	struct parport *p = dev_get_drvdata(&op->dev);

	int slot = p->dma;
@@ -216,8 +216,6 @@ static int ecpp_remove(struct platform_device *op) 
			   d_len);

		clear_bit(slot, dma_slot_map);

	}



	return 0;

}



static const struct of_device_id ecpp_match[] = {
@@ -245,7 +243,7 @@ static struct platform_driver ecpp_driver = { 
		.of_match_table = ecpp_match,

	},

	.probe			= ecpp_probe,

	.remove			= ecpp_remove,

	.remove_new		= ecpp_remove,

};



static int parport_pc_find_nonpci_ports(int autoirq, int autodma)

arch/sparc/include/asm/smp_64.h

+0 −2
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ void arch_send_call_function_ipi_mask(const struct cpumask *mask); 
int hard_smp_processor_id(void);

#define raw_smp_processor_id() (current_thread_info()->cpu)



void smp_fill_in_cpu_possible_map(void);

void smp_fill_in_sib_core_maps(void);

void __noreturn cpu_play_dead(void);
@@ -77,7 +76,6 @@ void __cpu_die(unsigned int cpu); 
#define smp_fill_in_sib_core_maps() do { } while (0)

#define smp_fetch_global_regs() do { } while (0)

#define smp_fetch_global_pmu() do { } while (0)

#define smp_fill_in_cpu_possible_map() do { } while (0)

#define smp_init_cpu_poke() do { } while (0)

#define scheduler_poke() do { } while (0)

arch/sparc/include/uapi/asm/termbits.h

+0 −10
Original line number Diff line number Diff line
@@ -10,16 +10,6 @@ typedef unsigned int tcflag_t; 
typedef unsigned long	tcflag_t;

#endif



#define NCC 8

struct termio {

	unsigned short c_iflag;		/* input mode flags */

	unsigned short c_oflag;		/* output mode flags */

	unsigned short c_cflag;		/* control mode flags */

	unsigned short c_lflag;		/* local mode flags */

	unsigned char c_line;		/* line discipline */

	unsigned char c_cc[NCC];	/* control characters */

};



#define NCCS 17

struct termios {

	tcflag_t c_iflag;		/* input mode flags */