Changeset 83


Ignore:
Timestamp:
Jan 16, 2007, 11:49:23 PM (15 years ago)
Author:
rainer
Message:

Fix for ticket #46 (kernel check issue with 2.6.19).

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/docs/Changelog

    r79 r83  
    112.3.1:
     2        * fix sh_kern.c for kernel 2.6.19 (reported by S. Clormann)
    23        * don't use sstrip in 'make deb', since dh_shlibdeps uses objdump
    34          (reported by B. Masuda)
  • trunk/src/sh_kern.c

    r68 r83  
    313313                           int * size, int direction)
    314314{
    315   char          path[128];
    316   char        * p = NULL;
    317   unsigned long x1, x2;
    318   char        * name = (char *) in_name;
     315  char            path[128];
     316  char          * p = NULL;
     317  unsigned long   x1 = 0, x2 = 0;
     318  unsigned char * name = (unsigned char *) in_name;
    319319
    320320  sl_snprintf(path, 128, "K_%s_%04d", prefix, num);
     
    423423
    424424#ifdef SH_PROC_CHECK
     425
     426/*
     427 * Defined in include/linux/fs.h
     428 */
     429
     430/* Here. we are only interested in 'lookup'. I.e. the struct
     431 * must be <= the real one, and 'lookup' must be at the
     432 * correct position.
     433 */
    425434struct inode_operations {
    426435  int (*create) (int *,int *,int);
     
    450459};
    451460
    452 /* this one is just for dummy purposes
     461/*
     462 * this one is just for dummy purposes
    453463 */
    454464struct file_operations {
     
    456466};
    457467
     468/* Defined in include/linux/proc_fs.h
     469 * Here we are interested in the 'proc_iops' member.
     470 */
    458471struct proc_dir_entry {
    459472  unsigned short low_ino;
     
    900913                       _("proc_root_inode_operations.lookup != proc_root_lookup"));
    901914    }
    902   else if ( ( ((unsigned int) * &proc_root_dir.proc_iops) != proc_root_iops)
    903             && (proc_root_dir.size != proc_root_iops))
     915  else if (    (((unsigned int) * &proc_root_dir.proc_iops) != proc_root_iops)
     916            && (proc_root_dir.size != proc_root_iops)
     917            && (((unsigned int) * &proc_root_dir.proc_fops) != proc_root_iops)
     918            )
    904919    {
    905920      sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_KERN_PROC,
Note: See TracChangeset for help on using the changeset viewer.