File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -24,7 +24,10 @@ use kernel::{
2424 c_str,
2525 drm:: gem:: shmem,
2626 error:: code:: * ,
27- io:: mem:: { Mem , MemFlags } ,
27+ io:: mem:: {
28+ Mem ,
29+ MemFlag , //
30+ } ,
2831 iosys_map:: IoSysMapRef ,
2932 macros:: versions,
3033 new_mutex,
@@ -787,7 +790,7 @@ impl GpuManager::ver {
787790 . try_into ( ) ?;
788791 let res = of_node. reserved_mem_region_to_resource_byname ( name) ?;
789792 // SAFETY: No dma here, just loading init data.
790- let mem = unsafe { Mem :: try_new ( res, MemFlag :: WB ) ? } ;
793+ let mem = unsafe { Mem :: try_new ( res, ( MemFlag :: WB ) . into ( ) ) ? } ;
791794 if size > mem. size ( ) {
792795 return Err ( ENOENT ) ;
793796 }
Original file line number Diff line number Diff line change @@ -1385,7 +1385,7 @@ impl Uat {
13851385 // much of this file and also the `pgtable` module, so it is difficult
13861386 // to prove in a single safety comment. Such is life with raw GPU
13871387 // page table management...
1388- let map = unsafe { io:: mem:: Mem :: try_new ( res, flags) } . inspect_err ( |_| {
1388+ let map = unsafe { io:: mem:: Mem :: try_new ( res, flags. into ( ) ) } . inspect_err ( |_| {
13891389 dev_err ! ( dev, "Failed to remap {} mem resource\n " , name) ;
13901390 } ) ?;
13911391
You can’t perform that action at this time.
0 commit comments