Revert "GCC: Fix up for gcc 5+"

This reverts commit ff505baaf412985af758d5820cd620ed9f1a7e05.

2 files changed, 1 insertions, 2 deletions

diff --git a/mm/Makefile b/mm/Makefile
index 59cd756ac..30e403700 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -1,7 +1,6 @@
 #
 # Makefile for the linux memory manager.
 #
-CFLAGS_KERNEL := -Wno-implicit-function-declaration -Wno-discarded-qualifiers -Wno-int-conversion
 
 mmu-y			:= nommu.o
 mmu-$(CONFIG_MMU)	:= fremap.o highmem.o madvise.o memory.o mincore.o \
diff --git a/mm/rmap.c b/mm/rmap.c
index e055ea71e..93d27a446 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -531,7 +531,7 @@ __vma_address(struct page *page, struct vm_area_struct *vma)
 }
 
 inline unsigned long
-static vma_address(struct page *page, struct vm_area_struct *vma)
+vma_address(struct page *page, struct vm_area_struct *vma)
 {
 	unsigned long address = __vma_address(page, vma);