diff options
| author | Andrew Morton <akpm@digeo.com> | 2003-01-05 03:50:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-01-05 03:50:48 -0800 |
| commit | 7dcb98ccf433ceaf6e61545722c753eb6703617f (patch) | |
| tree | ba677c8ea3381dc34f4288465d56d36a3d3d0c0d | |
| parent | 07ce6ac053470671cbc2b22d78e19d3fbeef32ad (diff) | |
[PATCH] misc fixes
- fix starfire.c printk compile warning (dma_addr_t can be 64 bit) (Martin
Bligh)
- Remove an ifdef from the scheduler
| -rw-r--r-- | drivers/net/starfire.c | 8 | ||||
| -rw-r--r-- | include/linux/highmem.h | 9 | ||||
| -rw-r--r-- | kernel/sched.c | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index 794e8e5f131e..4ee9d0d8d767 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c @@ -1847,15 +1847,15 @@ static int netdev_close(struct net_device *dev) #ifdef __i386__ if (debug > 2) { - printk("\n"KERN_DEBUG" Tx ring at %8.8x:\n", - np->tx_ring_dma); + printk("\n"KERN_DEBUG" Tx ring at %9.9Lx:\n", + (u64) np->tx_ring_dma); for (i = 0; i < 8 /* TX_RING_SIZE is huge! */; i++) printk(KERN_DEBUG " #%d desc. %8.8x %8.8x -> %8.8x.\n", i, le32_to_cpu(np->tx_ring[i].status), le32_to_cpu(np->tx_ring[i].first_addr), le32_to_cpu(np->tx_done_q[i].status)); - printk(KERN_DEBUG " Rx ring at %8.8x -> %p:\n", - np->rx_ring_dma, np->rx_done_q); + printk(KERN_DEBUG " Rx ring at %9.9Lx -> %p:\n", + (u64) np->rx_ring_dma, np->rx_done_q); if (np->rx_done_q) for (i = 0; i < 8 /* RX_RING_SIZE */; i++) { printk(KERN_DEBUG " #%d desc. %8.8x -> %8.8x\n", diff --git a/include/linux/highmem.h b/include/linux/highmem.h index 1586beac00fb..b8334a2df0d8 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h @@ -14,8 +14,6 @@ extern struct page *highmem_start_page; /* declarations for linux/mm/highmem.c */ unsigned int nr_free_highpages(void); -extern void check_highmem_ptes(void); - #else /* CONFIG_HIGHMEM */ static inline unsigned int nr_free_highpages(void) { return 0; } @@ -30,6 +28,13 @@ static inline void *kmap(struct page *page) { return page_address(page); } #endif /* CONFIG_HIGHMEM */ +#if defined(CONFIG_DEBUG_HIGHMEM) && defined(CONFIG_HIGHMEM) +extern void check_highmem_ptes(void); +#else +static inline void check_highmem_ptes(void) +{} +#endif + /* when CONFIG_HIGHMEM is not set these will be plain clear/copy_page */ static inline void clear_user_highpage(struct page *page, unsigned long vaddr) { diff --git a/kernel/sched.c b/kernel/sched.c index 11678e2b7f09..152d8f7bad9a 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -986,9 +986,7 @@ asmlinkage void schedule(void) } } -#if CONFIG_DEBUG_HIGHMEM check_highmem_ptes(); -#endif need_resched: preempt_disable(); prev = current; |