[merged] x86-fix-a-compile-error-a-section-type-conflict.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: arch/x86/kernel/cpu/perf_event_p6.c: fix section warning
has been removed from the -mm tree.  Its filename was
     x86-fix-a-compile-error-a-section-type-conflict.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: yangyongqiang <yangyongqiang01@xxxxxxxxx>
Subject: arch/x86/kernel/cpu/perf_event_p6.c: fix section warning

Fix a compile error - 'a section type conflict' by removing __initconst.

Signed-off-by: yangyongqiang <yangyongqiang01@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 arch/x86/kernel/cpu/perf_event_p6.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/x86/kernel/cpu/perf_event_p6.c~x86-fix-a-compile-error-a-section-type-conflict arch/x86/kernel/cpu/perf_event_p6.c
--- a/arch/x86/kernel/cpu/perf_event_p6.c~x86-fix-a-compile-error-a-section-type-conflict
+++ a/arch/x86/kernel/cpu/perf_event_p6.c
@@ -19,7 +19,7 @@ static const u64 p6_perfmon_event_map[] 
 
 };
 
-static __initconst u64 p6_hw_cache_event_ids
+static u64 p6_hw_cache_event_ids
 				[PERF_COUNT_HW_CACHE_MAX]
 				[PERF_COUNT_HW_CACHE_OP_MAX]
 				[PERF_COUNT_HW_CACHE_RESULT_MAX] =
_

Patches currently in -mm which might be from yangyongqiang01@xxxxxxxxx are

linux-next.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux