From: Jiang Liu <liuj97@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Jiang Liu <jiang.liu@huawei.com>,
David Rientjes <rientjes@google.com>,
Wen Congyang <wency@cn.fujitsu.com>, Mel Gorman <mgorman@suse.de>,
Minchan Kim <minchan@kernel.org>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Michal Hocko <mhocko@suse.cz>,
James Bottomley <James.Bottomley@HansenPartnership.com>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
David Howells <dhowells@redhat.com>,
Mark Salter <msalter@redhat.com>,
Jianguo Wu <wujianguo@huawei.com>,
linux-mm@kvack.org, linux-arch@vger.kernel.org,
linux-kernel@vger.kernel.org,
Hans-Christian Egtvedt <egtvedt@samfundet.no>,
Haavard Skinnemoen <hskinnemoen@gmail.com>
Subject: [PATCH v7, part3 16/16] AVR32: fix building warnings caused by redifinitions of HZ
Date: Fri, 17 May 2013 23:45:18 +0800 [thread overview]
Message-ID: <1368805518-2634-17-git-send-email-jiang.liu@huawei.com> (raw)
In-Reply-To: <1368805518-2634-1-git-send-email-jiang.liu@huawei.com>
As suggested by David Howells <dhowells@redhat.com>, use
asm-generic/param.h and uapi/asm-generic/param.h for AVR32.
It also fixes building warnings caused by redifinitions of HZ:
In file included from /ws/linux/kernel/linux.git/include/uapi/linux/param.h:4,
from include/linux/timex.h:63,
from include/linux/jiffies.h:8,
from include/linux/ktime.h:25,
from include/linux/timer.h:5,
from include/linux/workqueue.h:8,
from include/linux/srcu.h:34,
from include/linux/notifier.h:15,
from include/linux/memory_hotplug.h:6,
from include/linux/mmzone.h:777,
from include/linux/gfp.h:4,
from arch/avr32/mm/init.c:10:
/ws/linux/kernel/linux.git/arch/avr32/include/asm/param.h:6:1: warning: "HZ" redefined
In file included from /ws/linux/kernel/linux.git/arch/avr32/include/asm/param.h:4,
from /ws/linux/kernel/linux.git/include/uapi/linux/param.h:4,
from include/linux/timex.h:63,
from include/linux/jiffies.h:8,
from include/linux/ktime.h:25,
from include/linux/timer.h:5,
from include/linux/workqueue.h:8,
from include/linux/srcu.h:34,
from include/linux/notifier.h:15,
from include/linux/memory_hotplug.h:6,
from include/linux/mmzone.h:777,
from include/linux/gfp.h:4,
from arch/avr32/mm/init.c:10:
/ws/linux/kernel/linux.git/arch/avr32/include/uapi/asm/param.h:6:1: warning: this is the location of the previous definition
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: linux-kernel@vger.kernel.org
---
arch/avr32/include/asm/Kbuild | 1 +
arch/avr32/include/asm/param.h | 9 ---------
arch/avr32/include/uapi/asm/Kbuild | 1 +
arch/avr32/include/uapi/asm/param.h | 18 ------------------
4 files changed, 2 insertions(+), 27 deletions(-)
delete mode 100644 arch/avr32/include/asm/param.h
delete mode 100644 arch/avr32/include/uapi/asm/param.h
diff --git a/arch/avr32/include/asm/Kbuild b/arch/avr32/include/asm/Kbuild
index 4dd4f78..d22af85 100644
--- a/arch/avr32/include/asm/Kbuild
+++ b/arch/avr32/include/asm/Kbuild
@@ -2,3 +2,4 @@
generic-y += clkdev.h
generic-y += exec.h
generic-y += trace_clock.h
+generic-y += param.h
diff --git a/arch/avr32/include/asm/param.h b/arch/avr32/include/asm/param.h
deleted file mode 100644
index 009a167..0000000
--- a/arch/avr32/include/asm/param.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __ASM_AVR32_PARAM_H
-#define __ASM_AVR32_PARAM_H
-
-#include <uapi/asm/param.h>
-
-# define HZ CONFIG_HZ
-# define USER_HZ 100 /* User interfaces are in "ticks" */
-# define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */
-#endif /* __ASM_AVR32_PARAM_H */
diff --git a/arch/avr32/include/uapi/asm/Kbuild b/arch/avr32/include/uapi/asm/Kbuild
index df53e7a..3b85ead 100644
--- a/arch/avr32/include/uapi/asm/Kbuild
+++ b/arch/avr32/include/uapi/asm/Kbuild
@@ -33,3 +33,4 @@ header-y += termbits.h
header-y += termios.h
header-y += types.h
header-y += unistd.h
+generic-y += param.h
diff --git a/arch/avr32/include/uapi/asm/param.h b/arch/avr32/include/uapi/asm/param.h
deleted file mode 100644
index d28aa5e..0000000
--- a/arch/avr32/include/uapi/asm/param.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _UAPI__ASM_AVR32_PARAM_H
-#define _UAPI__ASM_AVR32_PARAM_H
-
-
-#ifndef HZ
-# define HZ 100
-#endif
-
-/* TODO: Should be configurable */
-#define EXEC_PAGESIZE 4096
-
-#ifndef NOGROUP
-# define NOGROUP (-1)
-#endif
-
-#define MAXHOSTNAMELEN 64
-
-#endif /* _UAPI__ASM_AVR32_PARAM_H */
--
1.8.1.2
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2013-05-17 15:47 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-17 15:45 [PATCH v7, part3 00/16] accurately calculate memory statisitic information Jiang Liu
2013-05-17 15:45 ` [PATCH v7, part3 01/16] mm: change signature of free_reserved_area() to fix building warnings Jiang Liu
2013-05-17 15:45 ` [PATCH v7, part3 02/16] mm: enhance free_reserved_area() to support poisoning memory with zero Jiang Liu
2013-05-17 15:45 ` [PATCH v7, part3 03/16] mm/ARM64: kill poison_init_mem() Jiang Liu
2013-05-17 15:45 ` [PATCH v7, part3 04/16] mm/x86: use free_reserved_area() to simplify code Jiang Liu
2013-05-17 15:45 ` [PATCH v7, part3 05/16] mm/tile: use common help functions to free reserved pages Jiang Liu
2013-05-17 15:45 ` [PATCH v7, part3 06/16] mm, powertv: use free_reserved_area() to simplify code Jiang Liu
2013-05-17 15:45 ` [PATCH v7, part3 07/16] mm, acornfb: " Jiang Liu
2013-05-17 15:45 ` [PATCH v7, part3 08/16] mm: fix some trivial typos in comments Jiang Liu
2013-05-17 15:45 ` [PATCH v7, part3 09/16] mm: use managed_pages to calculate default zonelist order Jiang Liu
2013-05-17 15:45 ` [PATCH v7, part3 10/16] mm: accurately calculate zone->managed_pages for highmem zones Jiang Liu
2013-05-17 15:45 ` [PATCH v7, part3 11/16] mm: use a dedicated lock to protect totalram_pages and zone->managed_pages Jiang Liu
2013-05-17 15:45 ` [PATCH v7, part3 12/16] mm: make __free_pages_bootmem() only available at boot time Jiang Liu
2013-05-17 15:45 ` [PATCH v7, part3 13/16] mm: correctly update zone->mamaged_pages Jiang Liu
2013-05-17 15:45 ` [PATCH v7, part3 14/16] mm: concentrate modification of totalram_pages into the mm core Jiang Liu
2013-05-29 8:49 ` Vineet Gupta
2013-05-17 15:45 ` [PATCH v7, part3 15/16] mm: report available pages as "MemTotal" for each NUMA node Jiang Liu
2013-05-17 15:45 ` Jiang Liu [this message]
2013-05-18 19:33 ` [PATCH v7, part3 16/16] AVR32: fix building warnings caused by redifinitions of HZ Hans-Christian Egtvedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1368805518-2634-17-git-send-email-jiang.liu@huawei.com \
--to=liuj97@gmail.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=akpm@linux-foundation.org \
--cc=dhowells@redhat.com \
--cc=egtvedt@samfundet.no \
--cc=hskinnemoen@gmail.com \
--cc=jiang.liu@huawei.com \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mhocko@suse.cz \
--cc=minchan@kernel.org \
--cc=msalter@redhat.com \
--cc=rientjes@google.com \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=wency@cn.fujitsu.com \
--cc=wujianguo@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).