diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-01-29 14:01:07 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-01-29 15:11:28 +0000 |
| commit | bf20364b582c383b4927f898de213b1cc0981a80 (patch) | |
| tree | 5412e0c14cf74df0d7ea29ff182e23d3281aac3e /core/include | |
| parent | afd985f6eec18a0f66a8fc55f9c5e3431128310f (diff) | |
| parent | a2d79191b501276026a0a16ec2fa664630a20476 (diff) | |
| download | syslinux-6.00-pre4.tar.gz | |
Merge tag 'syslinux-5.01' into firmwaresyslinux-6.00-pre4
Conflicts:
Makefile
NEWS
com32/cmenu/Makefile
com32/elflink/ldlinux/Makefile
com32/gfxboot/Makefile
com32/gpllib/Makefile
com32/include/sys/module.h
com32/lib/Makefile
com32/lib/sys/module/elf_module.c
com32/menu/Makefile
com32/rosh/Makefile
com32/samples/Makefile
core/init.c
mk/elf.mk
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'core/include')
| -rw-r--r-- | core/include/bios.h | 2 | ||||
| -rw-r--r-- | core/include/fs.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/include/bios.h b/core/include/bios.h index 9334c41a..7bbd274c 100644 --- a/core/include/bios.h +++ b/core/include/bios.h @@ -20,6 +20,8 @@ #ifndef _BIOS_H #define _BIOS_H +#include <sys/io.h> + /* * Interrupt vectors */ diff --git a/core/include/fs.h b/core/include/fs.h index 554dc97f..560458b6 100644 --- a/core/include/fs.h +++ b/core/include/fs.h @@ -7,6 +7,7 @@ #include <com32.h> #include <stdio.h> #include <sys/dirent.h> +#include <dprintf.h> #include "core.h" #include "disk.h" @@ -158,6 +159,8 @@ static inline void free_inode(struct inode * inode) static inline struct inode *get_inode(struct inode *inode) { inode->refcnt++; + dprintf("get_inode %p name %s refcnt %d\n", + inode, inode->name, inode->refcnt); return inode; } |