From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755401AbaKEOye (ORCPT ); Wed, 5 Nov 2014 09:54:34 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:25026 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755363AbaKEOya (ORCPT ); Wed, 5 Nov 2014 09:54:30 -0500 X-AuditID: cbfec7f5-b7f956d000005ed7-49-545a3a25e46a From: Andrey Ryabinin To: akpm@linux-foundation.org Cc: Andrey Ryabinin , Joe Perches , Dmitry Vyukov , Konstantin Serebryany , Dmitry Chernenkov , Andrey Konovalov , Yuri Gribov , Konstantin Khlebnikov , Sasha Levin , Christoph Lameter , Joonsoo Kim , Dave Hansen , Andi Kleen , Vegard Nossum , "H. Peter Anvin" , Dave Jones , x86@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Pekka Enberg , David Rientjes Subject: [PATCH v6 06/11] mm: slub: share slab_err and object_err functions Date: Wed, 05 Nov 2014 17:53:56 +0300 Message-id: <1415199241-5121-7-git-send-email-a.ryabinin@samsung.com> X-Mailer: git-send-email 2.1.3 In-reply-to: <1415199241-5121-1-git-send-email-a.ryabinin@samsung.com> References: <1404905415-9046-1-git-send-email-a.ryabinin@samsung.com> <1415199241-5121-1-git-send-email-a.ryabinin@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrILMWRmVeSWpSXmKPExsVy+t/xq7qqVlEhBpOPMVts+/WIzeL33pms FnPWr2GzOHLtO7vF9W9vGC0+vXzAaLHlehOTxfOHD9ktJjxsY7eYtlHcYmV3M5vF7PuPWSy2 P3vLZLGy8wGrxeVdc9gs7q35z2rR9vkfkFiykcli8ZHbzBbvnk1mtri66iC7xY8Nj1kdxDzm 7/zI6LFz1l12jwWbSj0W73nJ5LFpVSebx6ZPk9g9ut5eYfI4MeM3i8eTK9OZPD4+vcXi8WXV NWaP9/uusnn0bVnF6PF5k5zHiZYvrAH8UVw2Kak5mWWpRfp2CVwZi76sYSw4wF1xd8YJxgbG lZxdjJwcEgImEre2TWaCsMUkLtxbzwZiCwksZZToXZrVxcgFZPcxSfye0gZWxCagJ/Fv1naw IhEBWYmpf8+zgBQxC7xnlXh5bxJYkbCAt8TvmfvBilgEVCVOLu9gBrF5BVwlrj9ayt7FyAG0 TU5i6zpvkDCngJvEkf5FLBDLGhklPt/qZJnAyLuAkWEVo2hqaXJBcVJ6rpFecWJucWleul5y fu4mRkg0fd3BuPSY1SFGAQ5GJR5ej6bIECHWxLLiytxDjBIczEoivE3aUSFCvCmJlVWpRfnx RaU5qcWHGJk4OKUaGMXPXdwlGhL/o31Gp0pZhKuy2VqBoKNJnz2vzmidI25cabc36Ij380mh 8xWfvG07z8RX8K5j9Ts7H1vrlz8c50/NqjWWlPctURSZcuRCtHlcy8IfPNYrCrMWS9TtLfGW kfdZs+Pik60m7EevZWea7bsRtfCmr5fTsqe8b8ouXxTNnjd75UO1dCWW4oxEQy3mouJEAFOV w8uEAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove static and add function declarations to mm/slab.h so they could be used by kernel address sanitizer. Signed-off-by: Andrey Ryabinin --- include/linux/slub_def.h | 5 +++++ mm/slub.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index c75bc1d..144b5cb 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h @@ -115,4 +115,9 @@ static inline void *virt_to_obj(struct kmem_cache *s, void *slab_page, void *x) return x - ((x - slab_page) % s->size); } +__printf(3, 4) +void slab_err(struct kmem_cache *s, struct page *page, const char *fmt, ...); +void object_err(struct kmem_cache *s, struct page *page, + u8 *object, char *reason); + #endif /* _LINUX_SLUB_DEF_H */ diff --git a/mm/slub.c b/mm/slub.c index 80c170e..1458629 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -629,14 +629,14 @@ static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p) dump_stack(); } -static void object_err(struct kmem_cache *s, struct page *page, +void object_err(struct kmem_cache *s, struct page *page, u8 *object, char *reason) { slab_bug(s, "%s", reason); print_trailer(s, page, object); } -static void slab_err(struct kmem_cache *s, struct page *page, +void slab_err(struct kmem_cache *s, struct page *page, const char *fmt, ...) { va_list args; -- 2.1.3 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f46.google.com (mail-pa0-f46.google.com [209.85.220.46]) by kanga.kvack.org (Postfix) with ESMTP id 392066B00C0 for ; Wed, 5 Nov 2014 09:54:32 -0500 (EST) Received: by mail-pa0-f46.google.com with SMTP id lf10so921394pab.5 for ; Wed, 05 Nov 2014 06:54:31 -0800 (PST) Received: from mailout4.w1.samsung.com (mailout4.w1.samsung.com. [210.118.77.14]) by mx.google.com with ESMTPS id xq3si3153849pab.200.2014.11.05.06.54.30 for (version=TLSv1 cipher=RC4-MD5 bits=128/128); Wed, 05 Nov 2014 06:54:30 -0800 (PST) Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NEK00K3XMVEJQC0@mailout4.w1.samsung.com> for linux-mm@kvack.org; Wed, 05 Nov 2014 14:57:14 +0000 (GMT) From: Andrey Ryabinin Subject: [PATCH v6 06/11] mm: slub: share slab_err and object_err functions Date: Wed, 05 Nov 2014 17:53:56 +0300 Message-id: <1415199241-5121-7-git-send-email-a.ryabinin@samsung.com> In-reply-to: <1415199241-5121-1-git-send-email-a.ryabinin@samsung.com> References: <1404905415-9046-1-git-send-email-a.ryabinin@samsung.com> <1415199241-5121-1-git-send-email-a.ryabinin@samsung.com> Sender: owner-linux-mm@kvack.org List-ID: To: akpm@linux-foundation.org Cc: Andrey Ryabinin , Joe Perches , Dmitry Vyukov , Konstantin Serebryany , Dmitry Chernenkov , Andrey Konovalov , Yuri Gribov , Konstantin Khlebnikov , Sasha Levin , Christoph Lameter , Joonsoo Kim , Dave Hansen , Andi Kleen , Vegard Nossum , "H. Peter Anvin" , Dave Jones , x86@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Pekka Enberg , David Rientjes Remove static and add function declarations to mm/slab.h so they could be used by kernel address sanitizer. Signed-off-by: Andrey Ryabinin --- include/linux/slub_def.h | 5 +++++ mm/slub.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index c75bc1d..144b5cb 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h @@ -115,4 +115,9 @@ static inline void *virt_to_obj(struct kmem_cache *s, void *slab_page, void *x) return x - ((x - slab_page) % s->size); } +__printf(3, 4) +void slab_err(struct kmem_cache *s, struct page *page, const char *fmt, ...); +void object_err(struct kmem_cache *s, struct page *page, + u8 *object, char *reason); + #endif /* _LINUX_SLUB_DEF_H */ diff --git a/mm/slub.c b/mm/slub.c index 80c170e..1458629 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -629,14 +629,14 @@ static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p) dump_stack(); } -static void object_err(struct kmem_cache *s, struct page *page, +void object_err(struct kmem_cache *s, struct page *page, u8 *object, char *reason) { slab_bug(s, "%s", reason); print_trailer(s, page, object); } -static void slab_err(struct kmem_cache *s, struct page *page, +void slab_err(struct kmem_cache *s, struct page *page, const char *fmt, ...) { va_list args; -- 2.1.3 -- 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: email@kvack.org