[Pool] [Fwd: Re: Linux , PPS, and Me]

Alby alby at empire.org
Fri Feb 4 15:39:04 UTC 2011




 I'm wondering if my problems stem back to an error when I was
trying to patch the 2.6.26 kernel. It appears that when parport.h
was being patched, this error appeared:

.
.
patching file drivers/pps/sysfs.c
patching file drivers/serial/8250.c
Hunk #1 succeeded at 2242 (offset 8 lines).
Hunk #2 succeeded at 2457 (offset 8 lines).
patching file include/linux/Kbuild
patching file include/linux/parport.h
Hunk #2 FAILED at 329.
Hunk #3 succeeded at 528 (offset 6 lines).
1 out of 3 hunks FAILED -- saving rejects to file include/linux/parport.h.rej
patching file include/linux/pps.h
patching file include/linux/serial_core.h
.
.



 I looked at the parport.h.rej file and this is what it says:

godzilla:/newkernel/linux-source-2.6.26# cat include/linux/parport.h.rej
*************** struct parport {
*** 328,333 ****

        struct list_head full_list;
        struct parport *slaves[3];
  };

  #define DEFAULT_SPIN_TIME 500 /* us */
--- 329,339 ----

        struct list_head full_list;
        struct parport *slaves[3];
+
+ #ifdef CONFIG_PPS_CLIENT_LP
+       struct pps_source_info pps_info;
+       int pps_source;         /* PPS source ID */
+ #endif
  };

  #define DEFAULT_SPIN_TIME 500 /* us */
godzilla:/newkernel/linux-source-2.6.26#




   Anybody got a suggestion on how to fix it? I not a Kernel Patching
expert. Just following the notes on:
http://www.worldtimesolutions.com/support/ntp/Debian_Lenny_Linux_PPS_support_for_ntpd.html


Thanks,
Alby






More information about the pool mailing list