Merge branch 'master' into ysato-h8300

[uclinux-h8/linux.git] / include / linux / page_ext.h

diff --git a/include/linux/page_ext.h b/include/linux/page_ext.h
index d2a2c84..c42981c 100644 (file)
--- a/include/linux/page_ext.h
+++ b/include/linux/page_ext.h
@@ -40,7 +40,7 @@ struct page_ext {
 #ifdef CONFIG_PAGE_OWNER
        unsigned int order;
        gfp_t gfp_mask;
-       struct stack_trace trace;
+       unsigned int nr_entries;
        unsigned long trace_entries[8];
 #endif
 };