On Fri, Nov 06, 2015 at 02:46:30PM -0800, a...@linux-foundation.org wrote: > > The patch titled > Subject: mm-hwpoison-adjust-for-new-thp-refcounting-fix > has been added to the -mm tree. Its filename is > mm-hwpoison-adjust-for-new-thp-refcounting-fix.patch > > This patch should soon appear at > > http://ozlabs.org/~akpm/mmots/broken-out/mm-hwpoison-adjust-for-new-thp-refcounting-fix.patch > and later at > > http://ozlabs.org/~akpm/mmotm/broken-out/mm-hwpoison-adjust-for-new-thp-refcounting-fix.patch > > Before you just go and hit "reply", please: > a) Consider who else should be cc'ed > b) Prefer to cc a suitable mailing list as well > c) Ideally: find the original patch on the mailing list and do a > reply-to-all to that, adding suitable additional cc's > > *** Remember to use Documentation/SubmitChecklist when testing your code *** > > The -mm tree is included into linux-next and is updated > there every 3-4 working days > > ------------------------------------------------------ > From: Andrew Morton <a...@linux-foundation.org> > Subject: mm-hwpoison-adjust-for-new-thp-refcounting-fix > > remove unneeeeded #define, per Kirill > > Cc: Kirill A. Shutemov <kirill.shute...@linux.intel.com> > Cc: Naoya Horiguchi <n-horigu...@ah.jp.nec.com> > Signed-off-by: Andrew Morton <a...@linux-foundation.org> > --- > > include/linux/mm.h | 1 - > 1 file changed, 1 deletion(-) > > diff -puN include/linux/mm.h~mm-hwpoison-adjust-for-new-thp-refcounting-fix > include/linux/mm.h > --- a/include/linux/mm.h~mm-hwpoison-adjust-for-new-thp-refcounting-fix > +++ a/include/linux/mm.h > @@ -2193,7 +2193,6 @@ extern int memory_failure(unsigned long > extern void memory_failure_queue(unsigned long pfn, int trapno, int flags); > extern int unpoison_memory(unsigned long pfn); > extern int get_hwpoison_page(struct page *page); > -#define put_hwpoison_page(page) put_page(page) > extern void put_hwpoison_page(struct page *page);
Andrew, you've removed the wrong line. The next one should be removed. -- Kirill A. Shutemov -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/