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

Merge tag 'microblaze-v5.7-rc1' of git://git.monstr.eu/linux-2.6-microblaze 

Pull microblaze updates from Michal Simek:

 - convert license headers to SPDX

 - cleanup header handling and use asm-generic one

 - get rid of earlyprintk residues

 - define barriers and use it in the code

 - get rid of setup_irq() for timer

 - various small addons and fixes

* tag 'microblaze-v5.7-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Replace setup_irq() by request_irq()
  microblaze: Stop printing the virtual memory layout
  microblaze: Use asm generic cmpxchg.h for !SMP case
  microblaze: Define percpu sestion in linker file
  microblaze: Remove unused boot_cpuid variable
  microblaze: Add missing irqflags.h header
  microblaze: Add sync to tlb operations
  microblaze: Define microblaze barrier
  microblaze: Remove empty headers
  microblaze: Remove early printk setup
  microblaze: Remove architecture tlb.h and use generic one
  microblaze: Convert headers to SPDX license
  microblaze: Fix _reset() function
  microblaze: Kernel parameters should be parsed earlier
parents cad18da0 9fd1a1c9

arch/microblaze/include/asm/Kbuild

+3 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generated-y += syscall_table.h

generic-y += barrier.h

generic-y += bitops.h

generic-y += bug.h

generic-y += bugs.h
@@ -13,6 +12,7 @@ generic-y += exec.h 
generic-y += extable.h

generic-y += fb.h

generic-y += hardirq.h

generic-y += hw_irq.h

generic-y += irq_regs.h

generic-y += irq_work.h

generic-y += kdebug.h
@@ -31,8 +31,10 @@ generic-y += preempt.h 
generic-y += serial.h

generic-y += shmparam.h

generic-y += syscalls.h

generic-y += tlb.h

generic-y += topology.h

generic-y += trace_clock.h

generic-y += user.h

generic-y += vga.h

generic-y += word-at-a-time.h

generic-y += xor.h

arch/microblaze/include/asm/barrier.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (c) 2015 - 2020 Xilinx, Inc. All rights reserved.

 */



#ifndef _ASM_MICROBLAZE_BARRIER_H

#define _ASM_MICROBLAZE_BARRIER_H



#define mb()	__asm__ __volatile__ ("mbar 1" : : : "memory")



#include <asm-generic/barrier.h>



#endif /* _ASM_MICROBLAZE_BARRIER_H */

arch/microblaze/include/asm/cache.h

+1 −4
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Cache operations

 *

 * Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu>

 * Copyright (C) 2007-2009 PetaLogix

 * Copyright (C) 2003 John Williams <jwilliams@itee.uq.edu.au>

 *

 * This file is subject to the terms and conditions of the GNU General

 * Public License. See the file COPYING in the main directory of this

 * archive for more details.

 */



#ifndef _ASM_MICROBLAZE_CACHE_H

arch/microblaze/include/asm/cacheflush.h

+1 −5
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu>

 * Copyright (C) 2007-2009 PetaLogix
@@ -5,11 +6,6 @@ 
 * based on v850 version which was

 * Copyright (C) 2001,02,03 NEC Electronics Corporation

 * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>

 *

 * This file is subject to the terms and conditions of the GNU General

 * Public License. See the file COPYING in the main directory of this

 * archive for more details.

 *

 */



#ifndef _ASM_MICROBLAZE_CACHEFLUSH_H

arch/microblaze/include/asm/checksum.h

+1 −4
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (C) 2008 Michal Simek <monstr@monstr.eu>

 * Copyright (C) 2006 Atmark Techno, Inc.

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License. See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#ifndef _ASM_MICROBLAZE_CHECKSUM_H

CRA Git | Maintained and supported by SUSTech CRA and CCSE