From: Con Kolivas <kernel@kolivas.org>
To: Adam Petaccia <adam@tpetaccia.com>
Cc: linux kernel mailing list <linux-kernel@vger.kernel.org>,
ck list <ck@vds.kolivas.org>
Subject: Re: [ck] 2.6.13-ck2
Date: Wed, 7 Sep 2005 20:41:39 +1000 [thread overview]
Message-ID: <200509072041.40153.kernel@kolivas.org> (raw)
In-Reply-To: <1126031157.8117.5.camel@pimpmobile>
[-- Attachment #1: Type: text/plain, Size: 638 bytes --]
On Wed, 7 Sep 2005 04:25, Adam Petaccia wrote:
> I think this patch is missing an IFDEF or something (I'm not really a
> programmer, I just like to pretend). Anyway, I've tried building -ck2
> without swap enabled, and it failed. Just to make sure, I make'd
> distclean, and I get the following:
>
> LD .tmp_vmlinux1
> mm/built-in.o: In function `zone_watermark_ok':
> mm/page_alloc.c:763: undefined reference to `delay_prefetch'
> mm/built-in.o: In function `swap_setup':
> mm/swap.c:485: undefined reference to `prepare_prefetch'
> make: *** [.tmp_vmlinux1] Error 1
Bad layout on my part.
Try this patch on top.
Cheers,
Con
[-- Attachment #2: vm-prefetch_noswapfix.patch --]
[-- Type: text/x-diff, Size: 1794 bytes --]
Index: linux-2.6.13-ck2test/include/linux/swap.h
===================================================================
--- linux-2.6.13-ck2test.orig/include/linux/swap.h 2005-09-07 20:25:40.000000000 +1000
+++ linux-2.6.13-ck2test/include/linux/swap.h 2005-09-07 20:35:12.000000000 +1000
@@ -186,6 +186,32 @@ extern int shmem_unuse(swp_entry_t entry
extern void swap_unplug_io_fn(struct backing_dev_info *, struct page *);
+#ifdef CONFIG_SWAP_PREFETCH
+/* mm/swap_prefetch.c */
+extern void prepare_prefetch(void);
+extern void add_to_swapped_list(unsigned long index);
+extern void remove_from_swapped_list(unsigned long index);
+extern void delay_prefetch(void);
+
+#else /* CONFIG_SWAP_PREFETCH */
+static inline void add_to_swapped_list(unsigned long index)
+{
+}
+
+static inline void prepare_prefetch(void)
+{
+}
+
+static inline void remove_from_swapped_list(unsigned long index)
+{
+}
+
+static inline void delay_prefetch(void)
+{
+}
+
+#endif /* CONFIG_SWAP_PREFETCH */
+
#ifdef CONFIG_SWAP
/* linux/mm/page_io.c */
extern int swap_readpage(struct file *, struct page *);
@@ -249,32 +275,6 @@ static inline void put_swap_token(struct
__put_swap_token(mm);
}
-#ifdef CONFIG_SWAP_PREFETCH
-/* mm/swap_prefetch.c */
-extern void prepare_prefetch(void);
-extern void add_to_swapped_list(unsigned long index);
-extern void remove_from_swapped_list(unsigned long index);
-extern void delay_prefetch(void);
-
-#else /* CONFIG_SWAP_PREFETCH */
-static inline void add_to_swapped_list(unsigned long index)
-{
-}
-
-static inline void prepare_prefetch(void)
-{
-}
-
-static inline void remove_from_swapped_list(unsigned long index)
-{
-}
-
-static inline void delay_prefetch(void)
-{
-}
-
-#endif /* CONFIG_SWAP_PREFETCH */
-
#else /* CONFIG_SWAP */
#define total_swap_pages 0
next prev parent reply other threads:[~2005-09-07 10:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-05 13:44 2.6.13-ck2 Con Kolivas
2005-09-06 18:25 ` [ck] 2.6.13-ck2 Adam Petaccia
2005-09-06 20:31 ` 2.6.13-ck2 Rudo Thomas
2005-09-06 21:01 ` [ck] 2.6.13-ck2 Adam Petaccia
2005-09-07 10:41 ` Con Kolivas [this message]
2005-09-07 15:10 ` Adam Petaccia
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200509072041.40153.kernel@kolivas.org \
--to=kernel@kolivas.org \
--cc=adam@tpetaccia.com \
--cc=ck@vds.kolivas.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.