From: Christoph Hellwig This patch cleanups constant initializations. Signed-off-by: Vladimir V. Saveliev Signed-off-by: Andrew Morton --- fs/reiser4/key.c | 8 ++++---- fs/reiser4/plugin/disk_format/disk_format40.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff -puN fs/reiser4/key.c~reiser4-key-init-cleanup fs/reiser4/key.c --- devel/fs/reiser4/key.c~reiser4-key-init-cleanup 2005-09-28 22:55:37.000000000 -0700 +++ devel-akpm/fs/reiser4/key.c 2005-09-28 22:55:37.000000000 -0700 @@ -24,10 +24,10 @@ static const reiser4_key MINIMAL_KEY = { independent of key scheme. */ static const reiser4_key MAXIMAL_KEY = { .el = { - cpu_to_le64(~0ull), - ON_LARGE_KEY(cpu_to_le64(~0ull),) - cpu_to_le64(~0ull), - cpu_to_le64(~0ull) + __constant_cpu_to_le64(~0ull), + ON_LARGE_KEY(__constant_cpu_to_le64(~0ull),) + __constant_cpu_to_le64(~0ull), + __constant_cpu_to_le64(~0ull) } }; diff -puN fs/reiser4/plugin/disk_format/disk_format40.c~reiser4-key-init-cleanup fs/reiser4/plugin/disk_format/disk_format40.c --- devel/fs/reiser4/plugin/disk_format/disk_format40.c~reiser4-key-init-cleanup 2005-09-28 22:55:37.000000000 -0700 +++ devel-akpm/fs/reiser4/plugin/disk_format/disk_format40.c 2005-09-28 22:55:37.000000000 -0700 @@ -509,11 +509,11 @@ const reiser4_key *root_dir_key_format40 { static const reiser4_key FORMAT40_ROOT_DIR_KEY = { .el = { - cpu_to_le64((FORMAT40_ROOT_LOCALITY << 4) | KEY_SD_MINOR), + __constant_cpu_to_le64((FORMAT40_ROOT_LOCALITY << 4) | KEY_SD_MINOR), #if REISER4_LARGE_KEY ON_LARGE_KEY(0ull,) #endif - cpu_to_le64(FORMAT40_ROOT_OBJECTID), + __constant_cpu_to_le64(FORMAT40_ROOT_OBJECTID), 0ull } }; _