| Message ID | 1427904935-14387-12-git-send-email-emil.l.velikov@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Humble ping. Eric, can you please confirm if this and the follow up patch look ok. Thanks Emil On 1 April 2015 at 17:15, Emil Velikov <emil.l.velikov@gmail.com> wrote: > Added with commit 57b4c4c32d3(Move the renaming of mm.c symbols to > symbol duplication/collision with ones that are available elsewhere. > > As the public/private symbols of libdrm are properly annotated neither > one of the symbols will end up in the global name-space, thus should no > longer be required. > > Eric, > Does this sound correct, or there is something more subtle in there ? > > Cc: Eric Anholt <eric@anholt.net> > Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> > --- > intel/mm.h | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/intel/mm.h b/intel/mm.h > index 8a5235b..a6ee102 100644 > --- a/intel/mm.h > +++ b/intel/mm.h > @@ -38,16 +38,6 @@ struct mem_block { > unsigned int reserved:1; > }; > > -/* Rename the variables in the drm copy of this code so that it doesn't > - * conflict with mesa or whoever else has copied it around. > - */ > -#define mmInit drm_mmInit > -#define mmAllocMem drm_mmAllocMem > -#define mmFreeMem drm_mmFreeMem > -#define mmFindBlock drm_mmFindBlock > -#define mmDestroy drm_mmDestroy > -#define mmDumpMemInfo drm_mmDumpMemInfo > - > /** > * input: total size in bytes > * return: a heap pointer if OK, NULL if error > -- > 2.3.1 >
Emil Velikov <emil.l.velikov@gmail.com> writes: > Humble ping. > > Eric, can you please confirm if this and the follow up patch look ok. Seems reasonable if you've verified the symbols aren't exposed.
On 10/04/15 06:05, Eric Anholt wrote: > Emil Velikov <emil.l.velikov@gmail.com> writes: > >> Humble ping. >> >> Eric, can you please confirm if this and the follow up patch look ok. > > Seems reasonable if you've verified the symbols aren't exposed. > Neither the dri modules (i9[16]5_dri.so) nor libdrm_intel exports these. Are there any other components that I should take a look at? Thanks Emil
diff --git a/intel/mm.h b/intel/mm.h index 8a5235b..a6ee102 100644 --- a/intel/mm.h +++ b/intel/mm.h @@ -38,16 +38,6 @@ struct mem_block { unsigned int reserved:1; }; -/* Rename the variables in the drm copy of this code so that it doesn't - * conflict with mesa or whoever else has copied it around. - */ -#define mmInit drm_mmInit -#define mmAllocMem drm_mmAllocMem -#define mmFreeMem drm_mmFreeMem -#define mmFindBlock drm_mmFindBlock -#define mmDestroy drm_mmDestroy -#define mmDumpMemInfo drm_mmDumpMemInfo - /** * input: total size in bytes * return: a heap pointer if OK, NULL if error
Added with commit 57b4c4c32d3(Move the renaming of mm.c symbols to symbol duplication/collision with ones that are available elsewhere. As the public/private symbols of libdrm are properly annotated neither one of the symbols will end up in the global name-space, thus should no longer be required. Eric, Does this sound correct, or there is something more subtle in there ? Cc: Eric Anholt <eric@anholt.net> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> --- intel/mm.h | 10 ---------- 1 file changed, 10 deletions(-)