[S390] Get rid of new section mismatch warnings. (e62133b4) · Commits · 戴 / test

arch/s390/kernel/head.S

+1 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@
		#define ARCH_OFFSET 0
		#endif

		.section ".text.head","ax"
		#ifndef CONFIG_IPL
		.org 0
		.long 0x00080000,0x80000000+startup # Just a restart PSW

+1 −0

+3 −3

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ struct memory_segment {

		static LIST_HEAD(mem_segs);

		void memmap_init(unsigned long size, int nid, unsigned long zone,
		void __meminit memmap_init(unsigned long size, int nid, unsigned long zone,
		unsigned long start_pfn)
		{
		struct page start, end;
		@@ -66,7 +66,7 @@ void memmap_init(unsigned long size, int nid, unsigned long zone,
		}
		}

		static inline void *vmem_alloc_pages(unsigned int order)
		static void __init_refok *vmem_alloc_pages(unsigned int order)
		{
		if (slab_is_available())
		return (void *)__get_free_pages(GFP_KERNEL, order);

+2 −4

Original line number	Diff line number	Diff line
		@@ -147,8 +147,7 @@ raw3270_request_alloc(size_t size)
		* Allocate a new 3270 ccw request from bootmem. Only works very
		* early in the boot process. Only con3270.c should be using this.
		*/
		struct raw3270_request *
		raw3270_request_alloc_bootmem(size_t size)
		struct raw3270_request __init *raw3270_request_alloc_bootmem(size_t size)
		{
		struct raw3270_request *rq;

		@@ -848,8 +847,7 @@ raw3270_setup_device(struct ccw_device cdev, struct raw3270 rp, char *ascebc)
		/*
		* Setup 3270 device configured as console.
		*/
		struct raw3270 *
		raw3270_setup_console(struct ccw_device *cdev)
		struct raw3270 __init raw3270_setup_console(struct ccw_device cdev)
		{
		struct raw3270 *rp;
		char *ascebc;

+1 −2

Original line number	Diff line number	Diff line
		@@ -621,8 +621,7 @@ sclp_vt220_flush_buffer(struct tty_struct *tty)
		/*
		* Initialize all relevant components and register driver with system.
		*/
		static int
		__sclp_vt220_init(int early)
		static int __init_refok __sclp_vt220_init(int early)
		{
		void *page;
		int i;