lkml.org 
[lkml]   [2006]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 15/20] rtc.h broke strace(1) builds
    -stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Joe Korty <joe.korty@ccur.com>

    Git patch 52dfa9a64cfb3dd01fa1ee1150d589481e54e28e

    [PATCH] move rtc_interrupt() prototype to rtc.h

    broke strace(1) builds. The below moves the kernel-only additions lower,
    under the already provided #ifdef __KERNEL__ statement.

    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---

    include/linux/rtc.h | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- linux-2.6.16.orig/include/linux/rtc.h
    +++ linux-2.6.16/include/linux/rtc.h
    @@ -11,8 +11,6 @@
    #ifndef _LINUX_RTC_H_
    #define _LINUX_RTC_H_

    -#include <linux/interrupt.h>
    -
    /*
    * The struct used to pass data via the following ioctl. Similar to the
    * struct tm in <time.h>, but it needs to be here so that the kernel
    @@ -95,6 +93,8 @@ struct rtc_pll_info {

    #ifdef __KERNEL__

    +#include <linux/interrupt.h>
    +
    typedef struct rtc_task {
    void (*func)(void *private_data);
    void *private_data;
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-03-25 05:32    [W:0.020 / U:146.968 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site