Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 849de0cd authored Feb 24, 2017 by Gideon Israel Dsouza Committed by Linus Torvalds Feb 24, 2017

m68k: replace gcc specific macros with ones from compiler.h

There is <linux/compiler.h> which provides macros for various gcc
specific constructs.  Eg: __weak for __attribute__((weak)).  I've
cleaned all instances of gcc specific attributes with the right macros
for all files under /arch/m68k

Link: http://lkml.kernel.org/r/1485540901-1988-3-git-send-email-gidisrael@gmail.com


Signed-off-by: Gideon Israel Dsouza <gidisrael@gmail.com>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent a3f0825e

arch/m68k/68000/bootlogo-vz.h

+3 −1

Original line number	Original line	Diff line number	Diff line
			#include <linux/compiler.h>

	#define splash_width 640		#define splash_width 640
	#define splash_height 480		#define splash_height 480
	unsigned char __attribute__ ((aligned(16))) bootlogo_bits[] = {		unsigned char __aligned(16) bootlogo_bits[] = {
	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

arch/m68k/68000/bootlogo.h

+3 −1

Original line number	Original line	Diff line number	Diff line
			#include <linux/compiler.h>

	#define bootlogo_width 160		#define bootlogo_width 160
	#define bootlogo_height 160		#define bootlogo_height 160
	unsigned char __attribute__ ((aligned(16))) bootlogo_bits[] = {		unsigned char __aligned(16) bootlogo_bits[] = {
	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x01, 0x00, 0x00, 0x00,		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x01, 0x00, 0x00, 0x00,
	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
	0x00, 0x00, 0x40, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,		0x00, 0x00, 0x40, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

arch/m68k/include/asm/MC68328.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,6 +8,7 @@
	* Copyright (C) 1998 Kenneth Albanowski <kjahds@kjahds.com>,		* Copyright (C) 1998 Kenneth Albanowski <kjahds@kjahds.com>,
	*		*
	*/		*/
			#include <linux/compiler.h>

	#ifndef _MC68328_H_		#ifndef _MC68328_H_
	#define _MC68328_H_		#define _MC68328_H_
	@@ -993,7 +994,7 @@ typedef volatile struct {
	volatile unsigned short int pad1;		volatile unsigned short int pad1;
	volatile unsigned short int pad2;		volatile unsigned short int pad2;
	volatile unsigned short int pad3;		volatile unsigned short int pad3;
	} __attribute__((packed)) m68328_uart;		} __packed m68328_uart;


	/**********		/**********

arch/m68k/include/asm/MC68EZ328.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,6 +9,7 @@
	* The Silver Hammer Group, Ltd.		* The Silver Hammer Group, Ltd.
	*		*
	*/		*/
			#include <linux/compiler.h>

	#ifndef _MC68EZ328_H_		#ifndef _MC68EZ328_H_
	#define _MC68EZ328_H_		#define _MC68EZ328_H_
	@@ -815,7 +816,7 @@ typedef volatile struct {
	volatile unsigned short int nipr;		volatile unsigned short int nipr;
	volatile unsigned short int pad1;		volatile unsigned short int pad1;
	volatile unsigned short int pad2;		volatile unsigned short int pad2;
	} __attribute__((packed)) m68328_uart;		} __packed m68328_uart;


	/**********		/**********

arch/m68k/include/asm/MC68VZ328.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -909,7 +909,7 @@ typedef struct {
	volatile unsigned short int nipr;		volatile unsigned short int nipr;
	volatile unsigned short int hmark;		volatile unsigned short int hmark;
	volatile unsigned short int unused;		volatile unsigned short int unused;
	} __attribute__((packed)) m68328_uart;		} __packed m68328_uart;